diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8be6437..a311908 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,2 @@
-
-
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-**/*   @opensearch-project/dashboards-visualizations
\ No newline at end of file
+*   @pjfitzgibbons @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 6f9d235..a41d2aa 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,7 +4,29 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer | GitHub ID                                       | Affiliation |
-| ---------- | ----------------------------------------------- | ----------- |
-| David Cui  | [davidcui1225](https://github.com/davidcui1225) | Amazon      |
-| Joshua Li  | [joshuali925](https://github.com/joshuali925)   | Amazon      |
+| Maintainer        | GitHub ID                                         | Affiliation |
+| ----------------- | ------------------------------------------------- | ----------- |
+| Eric Wei          | [mengweieric](https://github.com/mengweieric)     | Amazon      |
+| Joshua Li         | [joshuali925](https://github.com/joshuali925)     | Amazon      |
+| Shenoy Pratik     | [ps48](https://github.com/ps48)                   | Amazon      |
+| Kavitha Mohan     | [kavithacm](https://github.com/kavithacm)         | Amazon      |
+| Rupal Mahajan     | [rupal-bq](https://github.com/rupal-bq)           | Amazon      |
+| Derek Ho          | [derek-ho](https://github.com/derek-ho)           | Amazon      |
+| Lior Perry        | [YANG-DB](https://github.com/YANG-DB)             | Amazon      |
+| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons) | Amazon      |
+| Simeon Widdis     | [swiddis](https://github.com/swiddis)             | Amazon      |
+| Chen Dai          | [dai-chen](https://github.com/dai-chen)           | Amazon      |
+| Vamsi Manohar     | [vamsi-amazon](https://github.com/vamsi-amazon)   | Amazon      |
+| Peng Huo          | [penghuo](https://github.com/penghuo)             | Amazon      |
+| Sean Kao          | [seankao-az](https://github.com/seankao-az)       | Amazon      |
+
+
+## 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      |
+| David Cui         | [davidcui1225](https://github.com/davidcui1225)         | Amazon      |
+| Eugene Lee        | [eugenesk24](https://github.com/eugenesk24)             | Amazon      |
\ No newline at end of file