diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 09fec6e293..bf1235f58c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @opensearch-project/engineering-effectiveness
\ No newline at end of file
+* @dblock @peterzhuamazon @bbarani @gaiksaya @rishabh6788 @zelinh @jordarlu @prudhvigodithi @Divyaasm @tianleh
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 1d3bc45d8c..a95824be8d 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -25,14 +25,18 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer       | GitHub ID                                           | Affiliation |
-| ---------------- | --------------------------------------------------- | ----------- |
+| Maintainer       | GitHub ID                                | Affiliation |
+| ---------------- |------------------------------------------| ----------- |
 | Peter Zhu        | [peterzhuamazon](https://github.com/peterzhuamazon) | Amazon      |
-| Barani Bikshandi | [bbarani](https://github.com/bbarani)               | Amazon      |
-| Sayali Gaikawad  | [gaiksaya](https://github.com/gaiksaya)             | Amazon      |
-| Rishab Singh     | [rishabh6788](https://github.com/rishabh6788)       | Amazon      |
-| Zelin Hao        | [zelinh](https://github.com/zelinh)                 | Amazon      |
-| Prudhvi Godithi  | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon      |
+| Barani Bikshandi | [bbarani](https://github.com/bbarani)    | Amazon      |
+| Sayali Gaikawad  | [gaiksaya](https://github.com/gaiksaya)  | Amazon      |
+| Rishab Singh     | [rishabh6788](https://github.com/rishabh6788) | Amazon      |
+| Zelin Hao        | [zelinh](https://github.com/zelinh)      | Amazon      |
+| Jeff Lu | [jordarlu](https://github.com/jordarlu)  | Amazon      |
+| Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon      |
+| Divya Madala  | [Divyaasm](https://github.com/Divyaasm)  | Amazon      |
+| Daniel (dB.) Doubrovkine  | [dblock](https://github.com/dblock)      | Amazon      |
+| Tianle Huang | [tianleh](https://github.com/tianleh)    | Amazon      |
 
 ## Release Owner