diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 526273f1..1c379673 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @dbwiddis @owaiskazi19 @joshpalis @ohltyler @amitgalitz @jackiehanyang @minalsha @saimedhi
\ No newline at end of file
+* @dbwiddis @owaiskazi19 @joshpalis @ohltyler @amitgalitz @jackiehanyang @minalsha @saimedhi @kamahuan
\ No newline at end of file
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 055f8b21..f4e2a69c 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -14,3 +14,4 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Dan Widdis                | [dbwiddis](https://github.com/dbwiddis)           | Amazon      |
 | Minal Shah                | [minalsha](https://github.com/minalsha)           | Amazon      |
 | Sai Medhini Reddy Maryada | [saimedhi](https://github.com/saimedhi)           | Amazon      |
+| Kama Huang                | [kamahuan](https://github.com/kamahuan)           | Amazon      |