diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 46a7e5f26b8..5f39327d54b 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
+*   @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
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 205c72ed327..0f6c888dd92 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -25,7 +25,8 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Xinrui Bai                | [xinruiba](https://github.com/xinruiba)             | Amazon      |
 | Ella Zhu                  | [zhyuanqi](https://github.com/zhyuanqi)             | Amazon      |
 | Eric Wei                  | [mengweieric](https://github.com/mengweieric)       | Amazon      |
-| Suchit Sahoo              | [LDrago27](https://github.com/LDrago27)             | Amazon      | 
+| Suchit Sahoo              | [LDrago27](https://github.com/LDrago27)             | Amazon      |
+| Viraj Sanghvi             | [virajsanghvi](https://github.com/virajsanghvi)     | Amazon      |
 
 ## Emeritus
 
diff --git a/changelogs/fragments/7196.yml b/changelogs/fragments/7196.yml
new file mode 100644
index 00000000000..d4b0bae3989
--- /dev/null
+++ b/changelogs/fragments/7196.yml
@@ -0,0 +1,2 @@
+doc:
+- Add Viraj as maintainer ([#7196](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7196))
\ No newline at end of file