diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 219b242a..edda2d0d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/job-scheduler
\ No newline at end of file
+*    @joshpalis @saratvemulapalli @dbwiddis @kaituo @vibrantvarun
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 2160506c..9315d3d0 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,10 +1,23 @@
-## Maintainers
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Ashish Agrawal | [lezzago](https://github.com/lezzago) | Amazon |
-| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
-| Drew Baugher | [dbbaughe](https://github.com/dbbaughe) | Amazon |
-| Mohammad Qureshi | [qreshi](https://github.com/qreshi) | Amazon |
-| Sriram Kosuri | [skkosuri-amzn](https://github.com/skkosuri-amzn) | 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).
+## Overview
+
+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 |
+| ----------------- | ------------------------------------------------------- | ----------- |
+| Josh Palis        | [joshpalis](https://github.com/joshpalis)               | Amazon      |
+| Sarat Vemulapalli | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
+| Dan Widdis        | [dbwiddis](https://github.com/dbwiddis)                 | Amazon      |
+| Kaituo Li         | [kaituo](https://github.com/kaituo)                     | Amazon      |
+| Varun Jain        | [vibrantvarun](https://github.com/vibrantvarun)         | Amazon      |
+
+## Emeritus Maintainers
+
+| Maintainer        | GitHub ID                                               | Affiliation |
+| ----------------- | ------------------------------------------------------- | ----------- |
+| Ashish Agrawal    | [lezzago](https://github.com/lezzago)                   | Amazon      |
+| Bowen Lan         | [bowenlan-amzn](https://github.com/bowenlan-amzn)       | Amazon      |
+| Drew Baugher      | [dbbaughe](https://github.com/dbbaughe)                 | Amazon      |
+| Mohammad Qureshi  | [qreshi](https://github.com/qreshi)                     | Amazon      |
+| Sriram Kosuri     | [skkosuri-amzn](https://github.com/skkosuri-amzn)       | Amazon      |