diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5ccdfda0658..057aef619ef 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @peterzhuamazon @bbarani @gaiksaya @rishabh6788 @zelinh @jordarlu @prudhvigodithi @Divyaasm
\ No newline at end of file
+* @peterzhuamazon @gaiksaya @rishabh6788 @zelinh @prudhvigodithi @Divyaasm
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 86029f777a9..fecb0c1ebba 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -7,10 +7,15 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Maintainer       | GitHub ID                                | Affiliation |
 | ---------------- |------------------------------------------| ----------- |
 | Peter Zhu        | [peterzhuamazon](https://github.com/peterzhuamazon) | Amazon      |
-| Barani Bikshandi | [bbarani](https://github.com/bbarani)    | Amazon      |
 | Sayali Gaikawad  | [gaiksaya](https://github.com/gaiksaya)  | Amazon      |
 | Rishab Singh     | [rishabh6788](https://github.com/rishabh6788) | Amazon      |
 | Zelin Hao        | [zelinh](https://github.com/zelinh)      | Amazon      |
-| Jeff Lu | [jordarlu](https://github.com/jordarlu)  | Amazon      |
 | Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon      |
-| Divya Madala  | [Divyaasm](https://github.com/Divyaasm)  | Amazon      |
\ No newline at end of file
+| Divya Madala  | [Divyaasm](https://github.com/Divyaasm)  | Amazon      |
+
+## Emeritus
+
+| Maintainer            | GitHub ID                                 | Affiliation |
+| --------------------- | ----------------------------------------- | ----------- |
+| Jeff Lu | [jordarlu](https://github.com/jordarlu)  | Amazon      |
+| Barani Bikshandi  | [bbarani](https://github.com/bbarani)               | Amazon      |