diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ccc4f4350..0b4d6df58 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @lezzago @AWSHurneyt @sbcd90 @eirsep @getsaurabh02 @praveensameneni @qreshi @bowenlan-amzn @rishabhmaurya @engechas @riysaxen-amzn @jowg-amazon
+*   @lezzago @AWSHurneyt @sbcd90 @eirsep @getsaurabh02 @praveensameneni @bowenlan-amzn @rishabhmaurya @engechas @riysaxen-amzn @jowg-amazon @amsiglan @goyamegh
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 36286c643..f46e22ad0 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,24 +4,26 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer            | GitHub ID                                             | Affiliation |
-|-----------------------|-------------------------------------------------------|-------------|
-| Ashish Agrawal        | [lezzago](https://github.com/lezzago)                 | Amazon      |
-| Mohammad Qureshi      | [qreshi](https://github.com/qreshi)                   | Amazon      |
-| Bowen Lan             | [bowenlan-amzn](https://github.com/bowenlan-amzn)     | Amazon      |
-| Saurabh Singh         | [getsaurabh02](https://github.com/getsaurabh02)       | Amazon      |
-| Rishabh Maurya        | [rishabhmaurya](https://github.com/rishabhmaurya)     | Amazon      |
-| Subhobrata DEY        | [sbcd90](https://github.com/sbcd90)                   | Amazon      |
-| Surya Sashank Nistala | [eirsep](https://github.com/eirsep)                   | Amazon      |
-| Thomas Hurney         | [AWSHurneyt](https://github.com/AWSHurneyt)           | Amazon      |
-| Praveen Sameneni      | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
-| Chase Engelbrecht     | [engechas](https://github.com/engechas)               | Amazon      |
-| Riya Saxena           | [riysaxen-amzn](https://github.com/riysaxen-amzn)     | Amazon    |
-| Joanne Wang           | [jowg-amazon](https://github.com/jowg-amazon)         | Amazon    |
+| Maintainer            | GitHub ID                                         | Affiliation |
+|-----------------------|---------------------------------------------------|-------------|
+| Ashish Agrawal        | [lezzago](https://github.com/lezzago)             | Amazon      |
+| Bowen Lan             | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon      |
+| Saurabh Singh         | [getsaurabh02](https://github.com/getsaurabh02)   | Amazon      |
+| Rishabh Maurya        | [rishabhmaurya](https://github.com/rishabhmaurya) | Amazon      |
+| Subhobrata DEY        | [sbcd90](https://github.com/sbcd90)               | Amazon      |
+| Surya Sashank Nistala | [eirsep](https://github.com/eirsep)               | Amazon      |
+| Thomas Hurney         | [AWSHurneyt](https://github.com/AWSHurneyt)       | Amazon      |
+| Praveen Sameneni  | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
+| Chase Engelbrecht     | [engechas](https://github.com/engechas)           | Amazon      |
+| Riya Saxena           | [riysaxen-amzn](https://github.com/riysaxen-amzn) | Amazon      |
+| Joanne Wang           | [jowg-amazon](https://github.com/jowg-amazon)     | Amazon      |
+| Amardeepsingh Siglani | [amsiglan](https://github.com/amsiglan)           | Amazon      | 
+| Megha Goyal           | [goyamegh](https://github.com/goyamegh)           | Amazon      | 
 
 ## Emeritus
 
-| Maintainer              | GitHub ID                                   | Affiliation |
-|-------------------------|---------------------------------------------| ----------- |
-| Sriram Kosuri    | [skkosuri-amzn](https://github.com/skkosuri-amzn) | Amazon      |
-| Tianli Feng      | [tlfeng](https://github.com/tlfeng)               | Amazon      |
+| Maintainer        | GitHub ID                                             | Affiliation |
+|-------------------|-------------------------------------------------------|-------------|
+| Sriram Kosuri     | [skkosuri-amzn](https://github.com/skkosuri-amzn)     | Amazon      |
+| Tianli Feng       | [tlfeng](https://github.com/tlfeng)                   | Amazon      |
+| Mohammad Qureshi      | [qreshi](https://github.com/qreshi)               | Amazon      |