diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9352fa52f..207b6b02f 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
+   @leeyun-amzn @bowenlan-amzn @dbbaughe @thalurur @vikasvb90 @tandonks @shiv0408 @soosinha
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index b2faf5d46..ddb585f95 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -5,5 +5,9 @@
 | Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
 | Drew Baugher | [dbbaughe](https://github.com/dbbaughe) | Amazon |
 | Ravi | [thalurur](https://github.com/thalurur) | Amazon |
+| Vikas Bansal | [vikasvb90](https://github.com/vikasvb90) | Amazon |
+| Kshitij Tandon | [tandonks](https://github.com/tandonks) | Amazon |
+| Shivansh Arora | [shiv0408](https://github.com/shiv0408) | Amazon |
+| Sooraj Sinha   | [soosinha](https://github.com/soosinha) | Amazon |
 
 [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