diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fdfdd3016..4b50fc4b3 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 @wujunshen @zane-neo @ylwu-amzn @jngz-es
+*   @heemin32 @navneet1v @VijayanB @vamshin @jmazanec15 @naveentatikonda @junqiu-lei @martin-gaievski @sean-zheng-amazon @model-collapse @zane-neo @ylwu-amzn @jngz-es @vibrantvarun
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index c93831c3f..ca991a405 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -7,7 +7,6 @@
 | Jack Mazanec            | [jmazanec15](https://github.com/jmazanec15)               | Amazon      |
 | Charlie Yang            | [model-collapse](https://github.com/model-collapse)       | Amazon      |
 | Navneet Verma           | [navneet1v](https://github.com/navneet1v)                 | Amazon      |
-| Junshen Wu              | [wujunshen](https://github.com/wujunshen)                 | 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      |
@@ -17,3 +16,9 @@
 | Naveen Tatikonda        | [naveentatikonda](https://github.com/naveentatikonda)     | Amazon      |
 | Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)                   | Amazon      |
 | Varun Jain              | [vibrantvarun](https://github.com/vibrantvarun)           | Amazon      |
+
+## Emeritus
+
+| Maintainer              | GitHub ID                                   | Affiliation |
+|-------------------------|---------------------------------------------|-------------|
+| Junshen Wu              | [wujunshen](https://github.com/wujunshen)   | Independent |