diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7f92a3c6..c74839ac 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
-*   @opensearch-project/sql
\ No newline at end of file
+*   @anirudha @nknize @penghuo @ps48 @kavithacm @derek-ho @joshuali925 @zhongnansu @chloe-zh @sejli @YANG-DB @davidcui1225 @rupal-bq @CEHENKLE @mengweieric @eugenesk24 @brijos @vamsi-amazon
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 073b4e20..5554db20 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -6,11 +6,17 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 | Maintainer            | GitHub ID                                           | Affiliation |
 | --------------------- | --------------------------------------------------- | ----------- |
-| Anirudha (Ani) Jadhav | [anirudha](https://github.com/anirudha)             | Amazon      |
 | Peng Huo              | [penghuo](https://github.com/penghuo)               | Amazon      |
 | Chen Dai              | [dai-chen](https://github.com/dai-chen)             | Amazon      |
-| Chloe Zhang           | [chloe-zh](https://github.com/chloe-zh)             | Amazon      |
-| Nick Knize            | [nknize](https://github.com/nknize)                 | Amazon      |
-| Charlotte Henkle      | [CEHENKLE](https://github.com/CEHENKLE)             | Amazon      |
+| Joshua Li             | [joshuali925](https://github.com/joshuali925        | Amazon      |
+| Vamsi Manohar         | [vamsi-amazon](https://github.com/vamsi-amazon      | Amazon      |
 | Max Ksyunz            | [MaxKsyunz](https://github.com/MaxKsyunz)           | BitQuill    |
-| Yury Fridlyand        | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | BitQuill    |
\ No newline at end of file
+| Yury Fridlyand        | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | BitQuill    |
+
+## Emeritus Maintainers
+
+| Maintainer        | GitHub ID                                               | Affiliation |
+| ----------------- | ------------------------------------------------------- | ----------- |
+| Charlotte Henkle  | [CEHENKLE](https://github.com/CEHENKLE)                 | Amazon      |
+| Anirudha Jadhav   | [anirudha](https://github.com/anirudha)                 | Amazon      |
+| Nick Knize        | [nknize](https://github.com/nknize)                     | Amazon      |
\ No newline at end of file