diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000000..7899a0afa723
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*   @ananzh @kavilla @seanneumann @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @kristenTian @zhongnansu @manasvinibs
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 717903ef2915..ecb3f2928616 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -7,8 +7,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Maintainer                | GitHub ID                                           | Affiliation |
 | ------------------------- | --------------------------------------------------- | ----------- |
 | Anan Zhuang               | [ananzh](https://github.com/ananzh)                 | Amazon      |
-| Bishoy Boktor             | [boktorbb](https://github.com/boktorbb)             | Amazon      |
-| Mihir Soni                | [mihirsoni](https://github.com/mihirsoni)           | Amazon      |
 | Kawika (Rocky) Avilla     | [kavilla](https://github.com/kavilla)               | Amazon      |
 | Sean Neumann              | [seanneumann](https://github.com/seanneumann)       | Amazon      |
 | Miki Barahmand            | [AMoo-Miki](https://github.com/AMoo-Miki)           | Amazon      |
@@ -25,3 +23,5 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Maintainer    | GitHub ID                               | Affiliation |
 | ------------- | --------------------------------------- | ----------- |
 | Tommy Markley | [tmarkley](https://github.com/tmarkley) | Amazon      |
+| Mihir Soni    | [mihirsoni](https://github.com/mihirsoni) | Amazon      |
+| Bishoy Boktor | [boktorbb](https://github.com/boktorbb) | Amazon      |