diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7feb3fe0b46..1cfed4fac0e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @mengweieric @vamsimanohar @swiddis @penghuo @seankao-az @MaxKsyunz @Yury-Fridlyand @anirudha @forestmvey @acarbonetto @GumpacG @ykmr1224 @LantaoJin @noCharger @qianheng-aws @yuancu @RyanL1997 @ahkcs
+*   @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @mengweieric @vamsimanohar @swiddis @penghuo @seankao-az @MaxKsyunz @Yury-Fridlyand @anirudha @forestmvey @acarbonetto @GumpacG @ykmr1224 @LantaoJin @noCharger @qianheng-aws @yuancu @RyanL1997 @ahkcs @songkant-aws
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 027fbc73b53..9c6388d1926 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -25,6 +25,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Yuanchun Shen     | [yuancu](https://github.com/yuancu)                 | Amazon      |
 | Ryan Liang        | [RyanL1997](https://github.com/RyanL1997)           | Amazon      |
 | Kai Huang         | [ahkcs](https://github.com/ahkcs)                   | Amazon      |
+| Songkan Tang      | [songkant-aws](https://github.com/songkant-aws)     | Amazon      |
 | Max Ksyunz        | [MaxKsyunz](https://github.com/MaxKsyunz)           | Improving   |
 | Yury Fridlyand    | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | Improving   |
 | Andrew Carbonetto | [acarbonetto](https://github.com/acarbonetto)       | Improving   |
@@ -43,4 +44,3 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Chloe Zhang       | [chloe-zh](https://github.com/chloe-zh)                 | Amazon      |
 | Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons)       | Amazon      |
 | Rupal Mahajan     | [rupal-bq](https://github.com/rupal-bq)                 | Amazon      |
-