diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5d2f2ead..d3f54fa2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @cliu123 @cwperks @DarshitChanpura @derek-ho @RyanL1997 @scrawfor99
+* @cwperks @DarshitChanpura @derek-ho @RyanL1997 @stephen-crawford
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 2d2ffb81..7d36fc6c 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -6,11 +6,10 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 | Maintainer       | GitHub ID                                             | Affiliation |
 | ---------------- | ----------------------------------------------------- | ----------- |
-| Chang Liu        | [cliu123](https://github.com/cliu123)                 | Amazon      |
 | Darshit Chanpura | [DarshitChanpura](https://github.com/DarshitChanpura) | Amazon      |
 | Craig Perkins    | [cwperks](https://github.com/cwperks)                 | Amazon      |
 | Ryan Liang       | [RyanL1997](https://github.com/RyanL1997)             | Amazon      |
-| Stephen Crawford | [scrawfor99](https://github.com/scrawfor99)           | Amazon      |
+| Stephen Crawford | [scrawfor99](https://github.com/stephen-crawford)     | Amazon      |
 | Derek Ho         | [derek-ho](https://github.com/derek-ho)               | Amazon      |
 
 ## Emeritus
@@ -22,3 +21,5 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Tianle Huang  | [tianleh](https://github.com/tianleh)               | Amazon      |
 | Dave Lago     | [davidlago](https://github.com/davidlago)           | Contributor |
 | Peter Nied    | [peternied](https://github.com/peternied)           | Amazon      |
+| Chang Liu     | [cliu123](https://github.com/cliu123)               | Amazon      |
+