diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3a722b6255a8..52648656bfa1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @kristenTian @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @BSFishy @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT
+*   @ananzh @kavilla @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @zhongnansu @manasvinibs @ZilongX @Flyingliuhub @BSFishy @curq @bandinib-amzn @SuZhou-Joe @ruanyl @BionIT
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c69a5fed399..a1ad681aaf4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -169,6 +169,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Remove `ui-select` dev dependency ([#5660](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5660))
 - Bump `chromedriver` dependency to `121.0.1"` ([#5926](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5926))
 - Add @ruanyl as a maintainer ([#5982](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5982))
+- Move @kristenTian to emeritus maintainer ([#6136](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6136))
 
 ### 🪛 Refactoring
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index ccb2f491554e..9ba46abf4d32 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -13,7 +13,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Josh Romero               | [joshuarrrr](https://github.com/joshuarrrr)         | Amazon      |
 | Abby Hu                   | [abbyhu2000](https://github.com/abbyhu2000)         | Amazon      |
 | Yan Zeng                  | [zengyan-amazon](https://github.com/zengyan-amazon) | Amazon      |
-| Kristen Tian              | [kristenTian](https://github.com/kristenTian)       | Amazon      |
 | Zhongnan Su               | [zhongnansu](https://github.com/zhongnansu)         | Amazon      |
 | Manasvini B Suryanarayana | [manasvinibs](https://github.com/manasvinibs)       | Amazon      |
 | Tao Liu                   | [Flyingliuhub](https://github.com/Flyingliuhub)     | Amazon      |
@@ -33,3 +32,4 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Mihir Soni    | [mihirsoni](https://github.com/mihirsoni)     | Amazon      |
 | Bishoy Boktor | [boktorbb](https://github.com/boktorbb)       | Amazon      |
 | Sean Neumann  | [seanneumann](https://github.com/seanneumann) | Contributor |
+| Kristen Tian  | [kristenTian](https://github.com/kristenTian) | Amazon      |