diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e8ac2f2e1d8..38bc588d7dd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,35 +11,35 @@
 /scripts/ @haroldrandom @fengzhou-msft
 /scripts/live_test @qwordy
 /src/azure-cli-testsdk/ @bim-msft @jsntcy @haroldrandom
-/src/azure-cli-core/ @jiasli @Juliehzl @haroldrandom @fengzhou-msft @evelyn-ys @jsntcy
+/src/azure-cli-core/ @jiasli @Juliehzl @haroldrandom @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
+/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
+/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @bim-msft @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
+/src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @qwordy
 /src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
 /src/azure-cli/azure/cli/command_modules/cosmosdb/ @dmakwana
 /src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @fengzhou-msft @Juliehzl
-/src/azure-cli/azure/cli/command_modules/container/ @zhoxing-ms
+/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
+/src/azure-cli/azure/cli/command_modules/keyvault/ @bim-msft @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/policyinsights/ @cheggert
-/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys
+/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/rdbms/ @Juliehzl @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/resource/ @Juliehzl @zhoxing-ms
-/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @jsntcy
+/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @jsntcy @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/storage/ @Juliehzl @jsntcy @zhoxing-ms @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/servicefabric/ @QingChenmsft @qwordy
 /src/azure-cli/azure/cli/command_modules/sql/ @jaredmoo @Juliehzl @evelyn-ys
-/src/azure-cli/azure/cli/command_modules/vm/ @qwordy
+/src/azure-cli/azure/cli/command_modules/vm/ @qwordy @houk-ms @yungezz
 /src/azure-cli/azure/cli/command_modules/eventhubs/ @v-ajnava
 /src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/apim/ @kevinhillinger @jonlester