diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 32a192325..1ac6fbcf7 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
-*   @heemin32 @navneet1v @VijayanB @vamshin @jmazanec15 @naveentatikonda @junqiu-lei @martin-gaievski @sean-zheng-amazon @model-collapse @zane-neo @ylwu-amzn @jngz-es @vibrantvarun @zhichao-aws @yuye-aws
+*   @heemin32 @navneet1v @VijayanB @vamshin @jmazanec15 @naveentatikonda @junqiu-lei @martin-gaievski @sean-zheng-amazon @model-collapse @zane-neo @vibrantvarun @zhichao-aws @yuye-aws @minalsha
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index d2e3cbd82..a1415e777 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -12,8 +12,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Charlie Yang            | [model-collapse](https://github.com/model-collapse)       | Amazon      |
 | Navneet Verma           | [navneet1v](https://github.com/navneet1v)                 | Amazon      |
 | Zan Niu                 | [zane-neo](https://github.com/zane-neo)                   | Amazon      |
-| Yaliang Wu              | [ylwu-amzn](https://github.com/ylwu-amzn)                 | Amazon      |
-| Jing Zhang              | [jngz-es](https://github.com/jngz-es)                     | Amazon      |
 | Heemin Kim              | [heemin32](https://github.com/heemin32)                   | Amazon      |
 | Junqiu Lei              | [junqiu-lei](https://github.com/junqiu-lei)               | Amazon      |
 | Martin Gaievski         | [martin-gaievski](https://github.com/martin-gaievski)     | Amazon      |
@@ -22,9 +20,13 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Varun Jain              | [vibrantvarun](https://github.com/vibrantvarun)           | Amazon      |
 | Zhichao Geng            | [zhichao-aws](https://github.com/zhichao-aws)             | Amazon      |
 | Yuye Zhu                | [yuye-aws](https://github.com/yuye-aws)                   | Amazon      |
+| Minal Shah              | [minalsha](https://github.com/minalsha)                   | Amazon      |
+
 
 ## Emeritus
 
 | Maintainer              | GitHub ID                                   | Affiliation |
 |-------------------------|---------------------------------------------|-------------|
 | Junshen Wu              | [wujunshen](https://github.com/wujunshen)   | Independent |
+| Yaliang Wu              | [ylwu-amzn](https://github.com/ylwu-amzn)                 | Amazon      |
+| Jing Zhang              | [jngz-es](https://github.com/jngz-es)                     | Amazon      |