diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index de20497d9..ac97b0205 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # This should match the team set up in https://github.com/orgs/opensearch-project/teams and include any additional contributors
-*   @nknize @harshavamsi
\ No newline at end of file
+*   @nknize @harshavamsi @Xtansia
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index e9a982f1f..51f33e4b6 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -7,4 +7,5 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Maintainer           | GitHub ID                                     | Affiliation |
 | -------------------- | --------------------------------------------- | ----------- |
 | Nick Knize           | [nknize](https://github.com/nknize)           | Amazon      |
-| Harsha Vamsi Kalluri | [harshavamsi](https://github.com/harshavamsi) | Amazon      |
\ No newline at end of file
+| Harsha Vamsi Kalluri | [harshavamsi](https://github.com/harshavamsi) | Amazon      |
+| Thomas Farr          | [Xtansia](https://github.com/Xtansia)         | Amazon      |