diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c7b9675ef6..8ae1a9ec2d 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
-*   @reta @Bukhtawar @dblock @madhusudhankonda @saratvemulapalli @VachaShah
\ No newline at end of file
+*   @reta @Bukhtawar @dblock @szczepanczykd @madhusudhankonda @saratvemulapalli @VachaShah @Xtansia
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 422bb1ddda..8039b8a363 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,26 +1,24 @@
-- [Overview](#overview)
-- [Current Maintainers](#current-maintainers)
-- [Emeritus](#emeritus)
- 
 ## Overview
 
-[This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
+This document contains a list of maintainers in this repo. See [opensearch-project/.github/RESPONSIBILITIES.md](https://github.com/opensearch-project/.github/blob/main/RESPONSIBILITIES.md#maintainer-responsibilities) that explains what the role of maintainer means, what maintainers do in this and other repos, and how they should be doing it. If you're interested in contributing, and becoming a maintainer, see [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Current Maintainers
 
-| Maintainer               | GitHub ID                                              | Affiliation |
-| ------------------------ | ------------------------------------------------------ | ----------- |
-| Andriy Redko             | [reta](https://github.com/reta)                        |   Aiven     |
-| Bukhtawar Khan           | [Bukhtawar](https://github.com/Bukhtawar)              |   Amazon    |
-| Daniel Doubrovkine       | [dblock](https://github.com/dblock)                    |   Amazon    |
-| Madhusudhan Konda        | [madhusudhankonda](https://github.com/madhusudhankonda)| Chocolateminds|
-| Sarat Vemulapalli        | [saratvemulapalli](https://github.com/saratvemulapalli)|   Amazon    |
-| Vacha Shah               | [VachaShah](https://github.com/VachaShah)              |   Amazon    |
+| Maintainer           | GitHub ID                                               | Affiliation    |
+| -------------------- | ------------------------------------------------------- | -------------- |
+| Andriy Redko         | [reta](https://github.com/reta)                         | Aiven          |
+| Bukhtawar Khan       | [Bukhtawar](https://github.com/Bukhtawar)               | Amazon         |
+| Daniel Doubrovkine   | [dblock](https://github.com/dblock)                     | Amazon         |
+| Dominik Szczepańczyk | [szczepanczykd](https://github.com/szczepanczykd)       | Exadel         |
+| Madhusudhan Konda    | [madhusudhankonda](https://github.com/madhusudhankonda) | Chocolateminds |
+| Sarat Vemulapalli    | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon         |
+| Thomas Farr          | [Xtansia](https://github.com/Xtansia)                   | Amazon         |
+| Vacha Shah           | [VachaShah](https://github.com/VachaShah)               | Amazon         |
 
 ## Emeritus
 
-| Maintainer      | GitHub ID                                           | Affiliation |
-| --------------- | --------------------------------------------------- | ----------- |
-| Mital Awachat            | [mitalawachat](https://github.com/mitalawachat)        | Amazon      |
-| Rishab Nahata            | [imRishN](https://github.com/imRishN)                  | Amazon      |
-| Vamshi Vijay Nakkirtha   | [vamshin](https://github.com/vamshin)                  | Amazon      |
+| Maintainer             | GitHub ID                                       | Affiliation |
+| ---------------------- | ----------------------------------------------- | ----------- |
+| Mital Awachat          | [mitalawachat](https://github.com/mitalawachat) | Amazon      |
+| Rishab Nahata          | [imRishN](https://github.com/imRishN)           | Amazon      |
+| Vamshi Vijay Nakkirtha | [vamshin](https://github.com/vamshin)           | Amazon      |