diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 891c858aa1a5..a0069ba271d0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT @xinruiba @zhyuanqi @mengweieric @LDrago27 @virajsanghvi @sejli @joshuali925
+*   @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT @xinruiba @zhyuanqi @mengweieric @LDrago27 @virajsanghvi @sejli @joshuali925 @huyaboo
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 321d9ab02794..9f964d82a66c 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -29,6 +29,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Viraj Sanghvi             | [virajsanghvi](https://github.com/virajsanghvi)     | Amazon      |
 | Sean Li                   | [sejli](https://github.com/sejli)                   | Amazon      |
 | Joshua Li                 | [joshuali925](https://github.com/joshuali925)       | Amazon      |
+| Huy Nguyen                | [huyaboo](https://github.com/huyaboo)               | Amazon      |
 
 ## Emeritus