diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cd025f06..48711d5f 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/anomaly-detection
\ No newline at end of file
+*   @ohltyler @kaituo @jackiehanyang @amitgalitz @sean-zheng-amazon
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index bafb14f5..9b4551dd 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,10 +4,19 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer              | GitHub ID                                               | Affiliation |
-| ----------------------- | ------------------------------------------------------- | ----------- |
-| Tyler Ohlsen            | [ohltyler](https://github.com/ohltyler)                 | Amazon      |
+| Maintainer              | GitHub ID                                                | Affiliation |
+| ----------------------- | -------------------------------------------------------- | ----------- |
+| Tyler Ohlsen            | [ohltyler](https://github.com/ohltyler)                  | Amazon      |
+| Kaituo Li               | [kaituo](https://github.com/kaituo)                      | Amazon      |
+| Jackie Han              | [jackiehanyang](https://github.com/jackiehanyang)        | Amazon      |
+| Amit Galitzky           | [amitgalitz](https://github.com/amitgalitz)              | Amazon      |
+| Sean Zheng              | [sean-zheng-amazon](https://github.com/sean-zheng-amazon)| Amazon      |
+
+## Emeritus Maintainers
+
+| Maintainer        | GitHub ID                                               | Affiliation |
+| ----------------- | ------------------------------------------------------- | ----------- |
 | Yaliang                 | [ylwu-amzn](https://github.com/ylwu-amzn)               | Amazon      |
 | Yizhe Liu               | [yizheliu-amazon](https://github.com/yizheliu-amazon)   | Amazon      |
 | Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)                 | Amazon      |
-| Sarat Vemulapalli       | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
+| Sarat Vemulapalli       | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
\ No newline at end of file