diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7237a21700add..e5d34bfc1e6dd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @reta @anasalkouz @andrross @reta @Bukhtawar @CEHENKLE @dblock @gbbafna @setiah @kartg @kotwanikunal @mch2 @nknize @owaiskazi19 @Rishikesh1159 @ryanbogan @saratvemulapalli @shwetathareja @dreamer-89 @tlfeng @VachaShah @dbwiddis
+*   @reta @anasalkouz @andrross @reta @Bukhtawar @CEHENKLE @dblock @gbbafna @setiah @kartg @kotwanikunal @mch2 @nknize @owaiskazi19 @Rishikesh1159 @ryanbogan @saratvemulapalli @shwetathareja @dreamer-89 @tlfeng @VachaShah @dbwiddis @sachinpkale
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 18aaac10bf9b0..8027c5daffc69 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,39 +1,39 @@
-- [Current Maintainers](#current-maintainers)
-- [Emeritus](#emeritus)
+## 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 |
-| --------------- | --------- | ----------- |
-| Anas Alkouz | [anasalkouz](https://github.com/anasalkouz) | Amazon |
-| Andrew Ross   | [andrross](https://github.com/andrross)| Amazon |
-| Andriy Redko | [reta](https://github.com/reta) | Aiven |
-| Bukhtawar Khan | [Bukhtawar](https://github.com/Bukhtawar) | Amazon |
-| Charlotte Henkle | [CEHENKLE](https://github.com/CEHENKLE) | Amazon |
-| Dan Widdis | [dbwiddis](https://github.com/dbwiddis) | Amazon |
-| Daniel "dB." Doubrovkine | [dblock](https://github.com/dblock) | Amazon |
-| Gaurav Bafna | [gbbafna](https://github.com/gbbafna) | Amazon |
-| Himanshu Setia | [setiah](https://github.com/setiah) | Amazon |
-| Kartik Ganesh | [kartg](https://github.com/kartg) | Amazon |
-| Kunal Kotwani | [kotwanikunal](https://github.com/kotwanikunal) | Amazon |
-| Marc Handalian | [mch2](https://github.com/mch2) | Amazon |
-| Nick Knize | [nknize](https://github.com/nknize) | Amazon |
-| Owais Kazi | [owaiskazi19](https://github.com/owaiskazi19) | Amazon |
-| Rishikesh Pasham | [Rishikesh1159](https://github.com/Rishikesh1159) | Amazon|
-| Ryan Bogan | [ryanbogan](https://github.com/ryanbogan) | Amazon |
-| Sarat Vemulapalli | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon |
-| Shweta Thareja | [shwetathareja](https://github.com/shwetathareja) | Amazon |
-| Suraj Singh | [dreamer-89](https://github.com/dreamer-89) | Amazon |
-| Tianli Feng | [tlfeng](https://github.com/tlfeng) | Amazon |
-| Vacha Shah | [VachaShah](https://github.com/VachaShah) | Amazon |
+| Maintainer               | GitHub ID                                               | Affiliation |
+|--------------------------| ------------------------------------------------------- | ----------- |
+| Anas Alkouz              | [anasalkouz](https://github.com/anasalkouz)             | Amazon      |
+| Andrew Ross              | [andrross](https://github.com/andrross)                 | Amazon      |
+| Andriy Redko             | [reta](https://github.com/reta)                         | Aiven       |
+| Bukhtawar Khan           | [Bukhtawar](https://github.com/Bukhtawar)               | Amazon      |
+| Charlotte Henkle         | [CEHENKLE](https://github.com/CEHENKLE)                 | Amazon      |
+| Dan Widdis               | [dbwiddis](https://github.com/dbwiddis)                 | Amazon      |
+| Daniel "dB." Doubrovkine | [dblock](https://github.com/dblock)                     | Amazon      |
+| Gaurav Bafna             | [gbbafna](https://github.com/gbbafna)                   | Amazon      |
+| Himanshu Setia           | [setiah](https://github.com/setiah)                     | Amazon      |
+| Kartik Ganesh            | [kartg](https://github.com/kartg)                       | Amazon      |
+| Kunal Kotwani            | [kotwanikunal](https://github.com/kotwanikunal)         | Amazon      |
+| Marc Handalian           | [mch2](https://github.com/mch2)                         | Amazon      |
+| Nick Knize               | [nknize](https://github.com/nknize)                     | Amazon      |
+| Owais Kazi               | [owaiskazi19](https://github.com/owaiskazi19)           | Amazon      |
+| Rishikesh Pasham         | [Rishikesh1159](https://github.com/Rishikesh1159)       | Amazon      |
+| Ryan Bogan               | [ryanbogan](https://github.com/ryanbogan)               | Amazon      |
+| Sachin Kale              | [sachinpkale](https://github.com/sachinpkale)           | Amazon      |
+| Sarat Vemulapalli        | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
+| Shweta Thareja           | [shwetathareja](https://github.com/shwetathareja)       | Amazon      |
+| Suraj Singh              | [dreamer-89](https://github.com/dreamer-89)             | Amazon      |
+| Tianli Feng              | [tlfeng](https://github.com/tlfeng)                     | Amazon      |
+| Vacha Shah               | [VachaShah](https://github.com/VachaShah)               | Amazon      |
 
 ## Emeritus
 
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Abbas Hussain | [abbashus](https://github.com/abbashus) | Amazon |
-| Megha Sai Kavikondala | [meghasaik](https://github.com/meghasaik) | Amazon |
-| Rabi Panda | [adnapibar](https://github.com/adnapibar) | Amazon |
-| Xue Zhou | [xuezhou25](https://github.com/xuezhou25) | 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).
+| Maintainer              | GitHub ID                                   | Affiliation |
+|-------------------------|---------------------------------------------| ----------- |
+| Abbas Hussain           | [abbashus](https://github.com/abbashus)     | Amazon      |
+| Megha Sai Kavikondala   | [meghasaik](https://github.com/meghasaik)   | Amazon      |
+| Rabi Panda              | [adnapibar](https://github.com/adnapibar)   | Amazon      |
+| Xue Zhou                | [xuezhou25](https://github.com/xuezhou25)   | Amazon      |