diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9352fa52f..596024a1f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1 @@
-# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/index-management
\ No newline at end of file
+*   @bowenlan-amzn @getsaurabh02 @lezzago @praveensameneni @xluo-aws @gaobinlong @Hailong-am @amsiglan @sbcd90 @eirsep @AWSHurneyt
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index ec8961f7a..eb99db5e3 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,14 +1,19 @@
-## Maintainers
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Ashish Agrawal | [lezzago](https://github.com/lezzago) | Amazon |
-| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
-| Charlotte | [CEHENKLE](https://github.com/CEHENKLE) | Amazon |
-| Drew Baugher | [dbbaughe](https://github.com/dbbaughe) | Amazon |
-| Mohammad Qureshi | [qreshi](https://github.com/qreshi) | Amazon |
-| Nick Knize | [nknize](https://github.com/nknize) | Amazon |
-| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni) | Amazon |
-| Ravi | [thalurur](https://github.com/thalurur) | Amazon |
-| Sriram | [skkosuri-amzn](https://github.com/skkosuri-amzn) | Amazon |
+## Overview
 
-[This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
\ No newline at end of file
+This document contains a list of maintainers in this repo. See [opensearch-project/.github/RESPONSIBILITIES.md](https://github.com/opensearch-project/.github/blob/main/RESPONSIBILITIES.md#maintainer-responsibilities) that explains what the role of maintainer means, what maintainers do in this and other repos, and how they should be doing it. If you're interested in contributing, and becoming a maintainer, see [CONTRIBUTING](CONTRIBUTING.md).
+
+## Current Maintainers
+
+| Maintainer            | GitHub ID                                             | Affiliation |
+| --------------------- | ----------------------------------------------------- | ----------- |
+| Ashish Agrawal        | [lezzago](https://github.com/lezzago)                 | Amazon      |
+| Bowen Lan             | [bowenlan-amzn](https://github.com/bowenlan-amzn)     | Amazon      |
+| Praveen Sameneni      | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
+| Saurabh Singh         | [getsaurabh02](https://github.com/getsaurabh02/)      | 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      |
+| Amardeepsingh Siglani | [amsiglan](https://github.com/amsiglan)               | 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      |