diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 15ed57c..467b9ce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1 @@
-# This should match the team set up in https://github.com/orgs/opensearch-project/teams and include any additional contributors
-*   @VachaShah @dblock @harshavamsi
\ No newline at end of file
+*   @VachaShah @dblock @harshavamsi @Xtansia
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 8f5a1ba..7b64a35 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,11 +4,12 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer              | GitHub ID                                     | Affiliation |
-| ----------------------- | --------------------------------------------- | ----------- |
-| Daniel Doubrovkine      | [dblock](https://github.com/dblock)           | Amazon      |
-| Harsha Vamsi Kalluri    | [harshavamsi](https://github.com/harshavamsi) | Amazon      |
-| Vacha Shah              | [VachaShah](https://github.com/VachaShah)     | Amazon      |
+| Maintainer           | GitHub ID                                     | Affiliation |
+| -------------------- | --------------------------------------------- | ----------- |
+| Daniel Doubrovkine   | [dblock](https://github.com/dblock)           | Amazon      |
+| Harsha Vamsi Kalluri | [harshavamsi](https://github.com/harshavamsi) | Amazon      |
+| Thomas Farr          | [Xtansia](https://github.com/Xtansia)         | Amazon      |
+| Vacha Shah           | [VachaShah](https://github.com/VachaShah)     | Amazon      |
 
 ## Emeritus