diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3ab86e29b..98c9da30e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @bowenlan-amzn @getsaurabh02 @lezzago @praveensameneni @xluo-aws @gaobinlong @Hailong-am @amsiglan @sbcd90 @eirsep @AWSHurneyt @jowg-amazon
+*   @bowenlan-amzn @getsaurabh02 @lezzago @praveensameneni @xluo-aws @gaobinlong @Hailong-am @amsiglan @sbcd90 @eirsep @AWSHurneyt @jowg-amazon @r1walz
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 28cd1fe31..1eff76303 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -18,3 +18,4 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Surya Sashank Nistala | [eirsep](https://github.com/eirsep)                   | Amazon      |
 | Thomas Hurney         | [AWSHurneyt](https://github.com/AWSHurneyt)           | Amazon      |
 | Joanne Wang           | [jowg-amazon](https://github.com/jowg-amazon)         | Amazon      |
+| Rohit Ashiwal         | [r1walz](https://github.com/r1walz)                   | Amazon      |