diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5c23ee8f..d0d862f8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,4 @@
-# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/performance-analyzer
\ No newline at end of file
+@samenp
+@khushbr
+@kkhatua
+@partsrut
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index d610e199..0efae1d3 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,10 +4,17 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
+| Maintainer        | GitHub ID                                                 | Affiliation |
+| ----------------- | --------------------------------------------------------- | ----------- |
+| Praveen Sameneni  | [praveensameneni](https://github.com/praveensameneni)     | Amazon      |
+| Khushboo Rajput   | [khushbr](https://github.com/khushbr)                     | Amazon      |
+| Kunal Khatua      | [kkhatua](https://github.com/kkhatua)                     | Amazon      |
+| Sruti Parthiban   | [sruti1312](https://github.com/sruti1312)                 | Amazon      |
+
+## Previous Maintainers
+
 | Maintainer      | GitHub ID                                   | Affiliation |
 | --------------- | ------------------------------------------- | ----------- |
 | Joshua Tokle    | [jotok](https://github.com/jotok)           | Amazon      |
-| Kunal Khatua    | [kkhatua](https://github.com/kkhatua)       | Amazon      |
 | Ruizhen Guo     | [rguo-aws](https://github.com/rguo-aws)     | Amazon      |
-| Sruti Parthiban | [sruti1312](https://github.com/sruti1312)   | Amazon      |
 | Yujia Sun       | [yujias0706](https://github.com/yujias0706) | Amazon      |