diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d0d862f8..63e39fdc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,2 @@
-@samenp
-@khushbr
-@kkhatua
-@partsrut
+# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
+*   @praveensameneni @khushbr @ansjcy @goyamegh @getsaurabh02 @sbcd90 @sgup432
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 0efae1d3..7f5e5d2c 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,17 +4,22 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer        | GitHub ID                                                 | Affiliation |
-| ----------------- | --------------------------------------------------------- | ----------- |
-| Praveen Sameneni  | [praveensameneni](https://github.com/praveensameneni)     | Amazon      |
-| Khushboo Rajput   | [khushbr](https://github.com/khushbr)                     | Amazon      |
-| Kunal Khatua      | [kkhatua](https://github.com/kkhatua)                     | Amazon      |
-| Sruti Parthiban   | [sruti1312](https://github.com/sruti1312)                 | Amazon      |
+| Maintainer       | GitHub ID                                             | Affiliation |
+|------------------|-------------------------------------------------------| ----------- |
+| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
+| Khushboo Rajput  | [khushbr](https://github.com/khushbr)                 | Amazon      |
+| Chenyang Ji      | [ansjcy](https://github.com/ansjcy)                   | Amazon      |
+| Megha Goyal      | [goyamegh](https://github.com/goyamegh)               | Amazon      |
+| Saurabh Singh    | [getsaurabh02](https://github.com/getsaurabh02)       | Amazon      |
+| Subhobrata Dey   | [sbcd90](https://github.com/sbcd90)                   | Amazon      |
+| Sagar            | [sgup432](https://github.com/sgup432)                 | Amazon      |
 
 ## Previous Maintainers
 
 | Maintainer      | GitHub ID                                   | Affiliation |
-| --------------- | ------------------------------------------- | ----------- |
+|-----------------|---------------------------------------------|-------------|
 | Joshua Tokle    | [jotok](https://github.com/jotok)           | Amazon      |
 | Ruizhen Guo     | [rguo-aws](https://github.com/rguo-aws)     | Amazon      |
 | Yujia Sun       | [yujias0706](https://github.com/yujias0706) | Amazon      |
+| Kunal Khatua    | [kkhatua](https://github.com/kkhatua)       | Amazon      |
+| Sruti Parthiban | [sruti1312](https://github.com/sruti1312)   | Amazon      |