diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1cfed4fac0..144a9e3589 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 @songkant-aws
+*   @ps48 @joshuali925 @dai-chen @mengweieric @vamsimanohar @swiddis @penghuo @anirudha @acarbonetto @ykmr1224 @LantaoJin @noCharger @qianheng-aws @yuancu @RyanL1997 @ahkcs @songkant-aws
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 9c6388d192..737bb09104 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -9,14 +9,10 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | 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      |
-| Derek Ho          | [derek-ho](https://github.com/derek-ho)             | Amazon      |
-| Lior Perry        | [YANG-DB](https://github.com/YANG-DB)               | Amazon      |
 | Simeon Widdis     | [swiddis](https://github.com/swiddis)               | Amazon      |
 | Chen Dai          | [dai-chen](https://github.com/dai-chen)             | Amazon      |
 | Vamsi Manohar     | [vamsimanohar](https://github.com/vamsimanohar)     | Amazon      |
 | Peng Huo          | [penghuo](https://github.com/penghuo)               | Amazon      |
-| Sean Kao          | [seankao-az](https://github.com/seankao-az)         | Amazon      |
 | Anirudha Jadhav   | [anirudha](https://github.com/anirudha)             | Amazon      |
 | Tomoyuki Morita   | [ykmr1224](https://github.com/ykmr1224)             | Amazon      |
 | Lantao Jin        | [LantaoJin](https://github.com/LantaoJin)           | Amazon      |
@@ -26,21 +22,25 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | 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   |
-| Forest Vey        | [forestmvey](https://github.com/forestmvey)         | Improving   |
-| Guian Gumpac      | [GumpacG](https://github.com/GumpacG)               | Improving   |
 
 ## Emeritus Maintainers
 
-| Maintainer        | GitHub ID                                               | Affiliation |
-| ----------------- | ------------------------------------------------------- | ----------- |
-| Charlotte Henkle  | [CEHENKLE](https://github.com/CEHENKLE)                 | 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      |
-| Zhongnan Su       | [zhongnansu](https://github.com/zhongnansu)             | Amazon      |
-| 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      |
+| Maintainer        | GitHub ID                                               |
+| ----------------- | ------------------------------------------------------- |
+| Charlotte Henkle  | [CEHENKLE](https://github.com/CEHENKLE)                 |
+| Nick Knize        | [nknize](https://github.com/nknize)                     |
+| David Cui         | [davidcui1225](https://github.com/davidcui1225)         |
+| Eugene Lee        | [eugenesk24](https://github.com/eugenesk24)             |
+| Zhongnan Su       | [zhongnansu](https://github.com/zhongnansu)             |
+| Chloe Zhang       | [chloe-zh](https://github.com/chloe-zh)                 |
+| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons)       |
+| Rupal Mahajan     | [rupal-bq](https://github.com/rupal-bq)                 |
+| Kavitha Mohan     | [kavithacm](https://github.com/kavithacm)               |
+| Derek Ho          | [derek-ho](https://github.com/derek-ho)                 |
+| Lior Perry        | [YANG-DB](https://github.com/YANG-DB)                   |
+| Sean Kao          | [seankao-az](https://github.com/seankao-az)             |
+| Max Ksyunz        | [MaxKsyunz](https://github.com/MaxKsyunz)               |
+| Yury Fridlyand    | [Yury-Fridlyand](https://github.com/Yury-Fridlyand)     |
+| Forest Vey        | [forestmvey](https://github.com/forestmvey)             |
+| Guian Gumpac      | [GumpacG](https://github.com/GumpacG)                   |