diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bc7e7b27c7d5..88e62892d9a9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @BSFishy @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT @xinruiba
+*   @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @BSFishy @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT @xinruiba @zhyuanqi
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 4f9791b3949f..d6155efcd837 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -24,6 +24,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Yulong Ruan               | [ruanyl](https://github.com/ruanyl)                 | Amazon      |
 | Lu Yu                     | [BionIT](https://github.com/BionIT)                 | Amazon      |
 | Xinrui Bai                | [xinruiba](https://github.com/xinruiba)             | Amazon      |
+| Ella Zhu                  | [zhyuanqi](https://github.com/zhyuanqi)             | Amazon      |
 
 ## Emeritus
 
diff --git a/changelogs/fragments/6788.yml b/changelogs/fragments/6788.yml
new file mode 100644
index 000000000000..a032e911c446
--- /dev/null
+++ b/changelogs/fragments/6788.yml
@@ -0,0 +1,2 @@
+doc:
+- Add zhyuanqi as maintainer ([#6788](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6788))
\ No newline at end of file