diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1b648abd0..134c5c583 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @abhivka7 @dblock @harshavamsi @pgtgrly @sachetalva @nhtruong @Xtansia @VachaShah
+*   @dblock @harshavamsi @sachetalva @nhtruong @Xtansia @VachaShah @Tokesh @aabeshov
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index e2be2cecb..d68014fab 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -8,12 +8,20 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 ## Current Maintainers
 
 | Maintainer           | GitHub ID                                     | Affiliation |
-| -------------------- | --------------------------------------------- | ----------- |
-| Abhi Kalra           | [abhivka7](https://github.com/abhivka7)       | Amazon      |
+|----------------------|-----------------------------------------------|-------------|
+| Alen Abeshov         | [aabeshov](https://github.com/aabeshov)       |             |
 | Daniel Doubrovkine   | [dblock](https://github.com/dblock)           | Amazon      |
 | Harsha Vamsi Kalluri | [harshavamsi](https://github.com/harshavamsi) | Amazon      |
-| Pranav Garg          | [pgtgrly](https://github.com/pgtgrly)         | Amazon      |
 | Sachet Alva          | [sachetalva](https://github.com/sachetalva)   | Amazon      |
 | Theo Truong          | [nhtruong](https://github.com/nhtruong)       | Amazon      |
 | Thomas Farr          | [Xtansia](https://github.com/Xtansia)         | Amazon      |
+| Torekeldi Niyazbek   | [Tokesh](https://github.com/Tokesh)           |             |
 | Vacha Shah           | [VachaShah](https://github.com/VachaShah)     | Amazon      |
+
+
+## Emeritus
+
+| Maintainer  | GitHub ID                               | Affiliation |
+|-------------|-----------------------------------------|-------------|
+| Abhi Kalra  | [abhivka7](https://github.com/abhivka7) | Amazon      |
+| Pranav Garg | [pgtgrly](https://github.com/pgtgrly)   | Amazon      |
\ No newline at end of file