diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6ca91f767..0ef219b80 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @amsiglan @AWSHurneyt @bowenlan-amzn @getsaurabh02 @praveensameneni @xluo-aws @gaobinlong @Hailong-am @SuZhou-Joe @lezzago @sbcd90 @eirsep
+*   @amsiglan @AWSHurneyt @bowenlan-amzn @getsaurabh02 @praveensameneni @xluo-aws @gaobinlong @Hailong-am @SuZhou-Joe @lezzago @sbcd90 @eirsep @r1walz
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index ab06348ba..2938c329a 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,23 +4,24 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer | GitHub ID                                         | Affiliation |
-|----------|---------------------------------------------------| ----------- |
-| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon      |
-| Saurabh Singh | [getsaurabh02](https://github.com/getsaurabh02)           | Amazon      |
-| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni)           | Amazon      |
-| Xuesong Luo           | [xluo-aws](https://github.com/xluo-aws)       | Amazon      |
-| Hailong Cui           | [Hailong-am](https://github.com/Hailong-am)   | Amazon      |
-| Binlong Gao           | [gaobinlong](https://github.com/gaobinlong)   | Amazon      |
-| Zhou Su               | [SuZhou-Joe](https://github.com/SuZhou-Joe)   | Amazon      |
-| Amardeepsingh Siglani | [amsiglan](https://github.com/amsiglan)       | Amazon      |
-| Thomas Hurney         | [AWSHurneyt](https://github.com/AWSHurneyt)   | Amazon      |
-| Ashish Agrawal        | [lezzago](https://github.com/lezzago)         | Amazon      |
-| Subhobrata DEY        | [sbcd90](https://github.com/sbcd90)           | Amazon      |
-| Surya Sashank Nistala | [eirsep](https://github.com/eirsep)           | Amazon      |
+| Maintainer            | GitHub ID                                             | Affiliation |
+| --------------------- | ----------------------------------------------------- | ----------- |
+| Bowen Lan             | [bowenlan-amzn](https://github.com/bowenlan-amzn)     | Amazon      |
+| Saurabh Singh         | [getsaurabh02](https://github.com/getsaurabh02)       | Amazon      |
+| Praveen Sameneni      | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
+| Xuesong Luo           | [xluo-aws](https://github.com/xluo-aws)               | Amazon      |
+| Hailong Cui           | [Hailong-am](https://github.com/Hailong-am)           | Amazon      |
+| Binlong Gao           | [gaobinlong](https://github.com/gaobinlong)           | Amazon      |
+| Zhou Su               | [SuZhou-Joe](https://github.com/SuZhou-Joe)           | Amazon      |
+| Amardeepsingh Siglani | [amsiglan](https://github.com/amsiglan)               | Amazon      |
+| Thomas Hurney         | [AWSHurneyt](https://github.com/AWSHurneyt)           | Amazon      |
+| Ashish Agrawal        | [lezzago](https://github.com/lezzago)                 | Amazon      |
+| Subhobrata DEY        | [sbcd90](https://github.com/sbcd90)                   | Amazon      |
+| Surya Sashank Nistala | [eirsep](https://github.com/eirsep)                   | Amazon      |
+| Rohit Ashiwal         | [r1walz](https://github.com/r1walz)                   | Amazon      |
 
 ## Emeritus
 
-| Maintainer  | GitHub ID                                  | Affiliation |
-|-------------| ------------------------------------------ | ----------- |
-| Angie Zhang | [Angie-Zhang](https://github.com/Angie-Zhang)     | Amazon      |
+| Maintainer    | GitHub ID                                     | Affiliation |
+| ------------- | --------------------------------------------- | ----------- |
+| Angie Zhang   | [Angie-Zhang](https://github.com/Angie-Zhang) | Amazon      |