diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 685b0be..ec4f9db 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/dashboards-reports
\ No newline at end of file
+*   @anirudha @nknize @ps48 @kavithacm @joshuali925 @zhongnansu @sejli @davidcui1225 @rupal-bq @CEHENKLE @mengweieric @eugenesk24 @vamsi-amazon
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 71fa129..5ca08f5 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,6 +1,3 @@
-- [Overview](#overview)
-- [Current Maintainers](#current-maintainers)
-
 ## Overview
 
 This document contains a list of maintainers in this repo. See [opensearch-project/.github/RESPONSIBILITIES.md](https://github.com/opensearch-project/.github/blob/main/RESPONSIBILITIES.md#maintainer-responsibilities) that explains what the role of maintainer means, what maintainers do in this and other repos, and how they should be doing it. If you're interested in contributing, and becoming a maintainer, see [CONTRIBUTING](CONTRIBUTING.md).
@@ -9,5 +6,12 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 | Maintainer             | GitHub ID                                         | Affiliation |
 | ---------------------- | ------------------------------------------------- | ----------- |
-| Joshua Li              | [joshuali925](https://github.com/joshuali925)     | Amazon      |
-| Rupal Mahajan          | [rupal-bq](https://github.com/rupal-bq)           | Amazon      |
\ No newline at end of file
+| Zhongnan Su            | [zhongnansu](https://github.com/zhongnansu)       | 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      |
\ No newline at end of file