diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f3c0da43009..d8d18557dd0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,21 +1,21 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
 
-*help.py @haroldrandom
-*help.yaml @haroldrandom
-*help.yml  @haroldrandom
+*help.py @msyyc
+*help.yaml @msyyc
+*help.yml @msyyc
 
-/linter_exclusions.yml @jsntcy @haroldrandom @kairu-ms
+/linter_exclusions.yml @jsntcy @kairu-ms
 
 /doc/ @jiasli @qwordy @dbradish-microsoft
-/tools/ @haroldrandom @fengzhou-msft
-/scripts/ @haroldrandom @fengzhou-msft
+/tools/ @fengzhou-msft @jiasli
+/scripts/ @fengzhou-msft @jiasli
 /scripts/live_test @qwordy
-/src/azure-cli-testsdk/ @bim-msft @jsntcy @haroldrandom
-/src/azure-cli-core/ @jiasli @Juliehzl @haroldrandom @fengzhou-msft @evelyn-ys @jsntcy @houk-ms
+/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @qwordy
+/src/azure-cli-core/ @jiasli @Juliehzl @fengzhou-msft @evelyn-ys @jsntcy @houk-ms
 /src/azure-cli/azure/cli/command_modules/acr/ @djyou @fengzhou-msft @yungezz
 /src/azure-cli/azure/cli/command_modules/acs/ @rjtsdl @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/advisor/ @Prasanna-Padmanabhan
-/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @bim-msft @qwordy
+/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @qwordy
 /src/azure-cli/azure/cli/command_modules/appservice/ @qwordy @Juliehzl
 /src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @qwordy
@@ -25,12 +25,12 @@
 /src/azure-cli/azure/cli/command_modules/container/ @zhoxing-ms @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
 /src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @Juliehzl @jsntcy
-/src/azure-cli/azure/cli/command_modules/extension/ @fengzhou-msft @haroldrandom
-/src/azure-cli/azure/cli/command_modules/keyvault/ @bim-msft @fengzhou-msft @yungezz @houk-ms
+/src/azure-cli/azure/cli/command_modules/extension/ @fengzhou-msft @msyyc
+/src/azure-cli/azure/cli/command_modules/keyvault/ @fengzhou-msft @yungezz @houk-ms
 /src/azure-cli/azure/cli/command_modules/monitor/ @msyyc @jsntcy @kairu-ms
-/src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @jsntcy @haroldrandom @kairu-ms @msyyc
-/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @haroldrandom @kairu-ms @msyyc
-/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @haroldrandom @kairu-ms @msyyc
+/src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @jsntcy @kairu-ms @msyyc
+/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @msyyc
+/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @msyyc
 /src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
 /src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/rdbms/ @Juliehzl @evelyn-ys
@@ -47,5 +47,5 @@
 /src/azure-cli/azure/cli/command_modules/aro/ @mjudeikis @jim-minter
 /src/azure-cli/azure/cli/command_modules/util/ @jiasli @Juliehzl @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/synapse/ @idear1203 @sunsw1994 @aim-for-better
-/src/azure-cli/azure/cli/command_modules/hdinsight/ @aim-for-better @haroldrandom @Juliehzl
+/src/azure-cli/azure/cli/command_modules/hdinsight/ @aim-for-better @Juliehzl @kairu-ms
 /src/azure-cli/azure/cli/command_modules/databoxedge/ @evelyn-ys @Juliehzl