diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9352fa52f..af889f6ad 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,4 @@
-# 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
+@Angie-Zhang
+@getsaurabh02
+@praveensameneni
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index f94d7b40e..ee84ced33 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,9 +4,9 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer   | GitHub ID                                         | Affiliation |
-| ------------ | ------------------------------------------------- | ----------- |
-| Annie Lee    | [leeyun-amzn](https://github.com/leeyun-amzn)     | Amazon      |
-| 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      |
+| Maintainer | GitHub ID                                         | Affiliation |
+|----------|---------------------------------------------------| ----------- |
+| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon      |
+| Angie Zhang | [Angie-Zhang](https://github.com/Angie-Zhang)     | Amazon      |
+| Saurabh Singh | [getsaurabh02](https://github.com/getsaurabh02)           | Amazon      |
+| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni)           | Amazon      |