diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 07d643136..67a22979a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @bowenlan-amzn @getsaurabh02 @lezzago @praveensameneni @xluo-aws @gaobinlong @Hailong-am @amsiglan @sbcd90 @eirsep @AWSHurneyt @jowg-amazon @r1walz @vikasvb90
+*   @bowenlan-amzn @Hailong-am @r1walz @vikasvb90
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 39016b7a7..60cc5d0f4 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -6,17 +6,22 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 | Maintainer            | GitHub ID                                             | Affiliation |
 |-----------------------|-------------------------------------------------------| ----------- |
-| Ashish Agrawal        | [lezzago](https://github.com/lezzago)                 | Amazon      |
+| Vikas Bansal          | [vikasvb90](https://github.com/vikasvb90)             | Amazon      |
 | Bowen Lan             | [bowenlan-amzn](https://github.com/bowenlan-amzn)     | Amazon      |
-| Praveen Sameneni      | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
-| Saurabh Singh         | [getsaurabh02](https://github.com/getsaurabh02/)      | Amazon      |
-| Xuesong Luo           | [xluo-aws](https://github.com/xluo-aws)               | Amazon      |
 | Hailong Cui           | [Hailong-am](https://github.com/Hailong-am)           | Amazon      |
-| Binlong Gao           | [gaobinlong](https://github.com/gaobinlong)           | Amazon      |
+| Rohit Ashiwal         | [r1walz](https://github.com/r1walz)                   | Independent |
+
+## Emeritus
+
+| Maintainer            | GitHub ID                                             | Affiliation |
+|-----------------------|-------------------------------------------------------| ----------- |
 | Amardeepsingh Siglani | [amsiglan](https://github.com/amsiglan)               | Amazon      |
+| Binlong Gao           | [gaobinlong](https://github.com/gaobinlong)           | Amazon      |
+| Ashish Agrawal        | [lezzago](https://github.com/lezzago)                 | Amazon      |
+| Joanne Wang           | [jowg-amazon](https://github.com/jowg-amazon)         | Amazon      |
+| Praveen Sameneni      | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
+| Saurabh Singh         | [getsaurabh02](https://github.com/getsaurabh02/)      | Amazon      |
 | Subhobrata Dey        | [sbcd90](https://github.com/sbcd90)                   | Amazon      |
 | Surya Sashank Nistala | [eirsep](https://github.com/eirsep)                   | Amazon      |
 | Thomas Hurney         | [AWSHurneyt](https://github.com/AWSHurneyt)           | Amazon      |
-| Joanne Wang           | [jowg-amazon](https://github.com/jowg-amazon)         | Amazon      |
-| Rohit Ashiwal         | [r1walz](https://github.com/r1walz)                   | Amazon      |
-| Vikas Bansal          | [vikasvb90](https://github.com/vikasvb90)             | Amazon      |
+| Xuesong Luo           | [xluo-aws](https://github.com/xluo-aws)               | Amazon      |