diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e9810220de1b6..f3a89032552f7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @reta @anasalkouz @andrross @reta @Bukhtawar @CEHENKLE @dblock @gbbafna @setiah @kartg @kotwanikunal @mch2 @nknize @owaiskazi19 @adnapibar @Rishikesh1159 @ryanbogan @saratvemulapalli @shwetathareja @dreamer-89 @tlfeng @VachaShah @xuezhou25
+*   @reta @anasalkouz @andrross @reta @Bukhtawar @CEHENKLE @dblock @gbbafna @setiah @kartg @kotwanikunal @mch2 @nknize @owaiskazi19 @Rishikesh1159 @ryanbogan @saratvemulapalli @shwetathareja @dreamer-89 @tlfeng @VachaShah @xuezhou25
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 2f1bff28a53cc..daabf8c26c8ac 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -19,7 +19,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Marc Handalian           | [mch2](https://github.com/mch2)                         | Amazon      |
 | Nick Knize               | [nknize](https://github.com/nknize)                     | Amazon      |
 | Owais Kazi               | [owaiskazi19](https://github.com/owaiskazi19)           | Amazon      |
-| Rabi Panda               | [adnapibar](https://github.com/adnapibar)               | Amazon      |
 | Rishikesh Pasham         | [Rishikesh1159](https://github.com/Rishikesh1159)       | Amazon      |
 | Ryan Bogan               | [ryanbogan](https://github.com/ryanbogan)               | Amazon      |
 | Sarat Vemulapalli        | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
@@ -31,7 +30,8 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Emeritus
 
-| Maintainer            | GitHub ID                                 | Affiliation |
-| --------------------- | ----------------------------------------- | ----------- |
-| Abbas Hussain         | [abbashus](https://github.com/abbashus)   | Amazon      |
-| Megha Sai Kavikondala | [meghasaik](https://github.com/meghasaik) | Amazon      |
+| Maintainer              | GitHub ID                                   | Affiliation |
+|-------------------------|---------------------------------------------| ----------- |
+| Abbas Hussain           | [abbashus](https://github.com/abbashus)     | Amazon      |
+| Megha Sai Kavikondala   | [meghasaik](https://github.com/meghasaik)   | Amazon      |
+| Rabi Panda              | [adnapibar](https://github.com/adnapibar)   | Amazon      |