diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6ea02bfba..c5b488962 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,7 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/alerting-plugin
\ No newline at end of file
+@lezzago
+@AWSHurneyt
+@sbcd90
+@eirsep
+@getsaurabh02
+@praveensameneni
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index e66b9b242..89e951d3f 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -8,8 +8,16 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | ---------------- | ------------------------------------------------- | ----------- |
 | Ashish Agrawal   | [lezzago](https://github.com/lezzago)             | Amazon      |
 | Mohammad Qureshi | [qreshi](https://github.com/qreshi)               | Amazon      |
-| Sriram Kosuri    | [skkosuri-amzn](https://github.com/skkosuri-amzn) | 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      |
+
+## Emeritus
+
+| Maintainer              | GitHub ID                                   | Affiliation |
+|-------------------------|---------------------------------------------| ----------- |
+| Sriram Kosuri    | [skkosuri-amzn](https://github.com/skkosuri-amzn) | Amazon      |
 | Tianli Feng      | [tlfeng](https://github.com/tlfeng)               | Amazon      |
-| Annie Lee        | [leeyun-amzn](https://github.com/leeyun-amzn)     | Amazon      |