diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 65b403b9ffb..98bcbed63ab 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -27,51 +27,51 @@
 /src/azure-cli/setup.py @Azure/act-identity-squad @Azure/act-codegen-extensibility-squad
 /src/azure-cli/requirements.*.txt @Azure/act-codegen-extensibility-squad @Azure/act-quality-productivity-squad @Azure/act-platform-engineering-squad @Azure/act-identity-squad
 
-/src/azure-cli/azure/cli/command_modules/acr/ @Azure/act-observability-squad @northtyphoon @rosanch
-/src/azure-cli/azure/cli/command_modules/acs/ @Azure/act-observability-squad @fumingzhang @elvazhu521
-/src/azure-cli/azure/cli/command_modules/advisor/ @Azure/act-codegen-extensibility-squad @Prasanna-Padmanabhan
-/src/azure-cli/azure/cli/command_modules/apim/ @Azure/act-observability-squad @kevinhillinger @jonlester
-/src/azure-cli/azure/cli/command_modules/appconfig/ @Azure/act-codegen-extensibility-squad @ChristineWanjau @albertofori @avanigupta @mrm9084
-/src/azure-cli/azure/cli/command_modules/appservice/ @Azure/act-observability-squad @panchagnula
-/src/azure-cli/azure/cli/command_modules/aro/ @Azure/act-codegen-extensibility-squad @bennerv @hawkowl @jewzaam @rogbas
-/src/azure-cli/azure/cli/command_modules/backup/ @Azure/act-observability-squad @dragonfly91 @akshayneema
-/src/azure-cli/azure/cli/command_modules/batch/ @Azure/act-observability-squad @cRui861 @wanghoppe @dpwatrous @wiboris
-/src/azure-cli/azure/cli/command_modules/batchai/ @Azure/act-codegen-extensibility-squad @AlexanderYukhanov
-/src/azure-cli/azure/cli/command_modules/botservice/ @Azure/act-experience-enablement-squad @jiaxuwu2021 @luhan2017
-/src/azure-cli/azure/cli/command_modules/cdn/ @Azure/act-quality-productivity-squad @t-bzhan
+/src/azure-cli/azure/cli/command_modules/acr/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/acs/ @Azure/act-observability-squad @fumingzhang
+/src/azure-cli/azure/cli/command_modules/advisor/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/apim/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/appconfig/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/appservice/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/aro/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/backup/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/batch/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/batchai/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/botservice/ @Azure/act-experience-enablement-squad
+/src/azure-cli/azure/cli/command_modules/cdn/ @Azure/act-quality-productivity-squad
 /src/azure-cli/azure/cli/command_modules/cloud/ @Azure/act-identity-squad
-/src/azure-cli/azure/cli/command_modules/consumption/ @Azure/act-codegen-extensibility-squad @sandeepnl
-/src/azure-cli/azure/cli/command_modules/container/ @Azure/act-observability-squad @joseph-porter
-/src/azure-cli/azure/cli/command_modules/cosmosdb/ @Azure/act-codegen-extensibility-squad @dmakwana @kristynhamasaki
+/src/azure-cli/azure/cli/command_modules/consumption/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/container/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/cosmosdb/ @Azure/act-codegen-extensibility-squad
 /src/azure-cli/azure/cli/command_modules/databoxedge/ @Azure/act-codegen-extensibility-squad
-/src/azure-cli/azure/cli/command_modules/dls/ @Azure/act-codegen-extensibility-squad @akharit @rahuldutta90
-/src/azure-cli/azure/cli/command_modules/dms/ @Azure/act-codegen-extensibility-squad @temandr @binuj
-/src/azure-cli/azure/cli/command_modules/eventgrid/ @Azure/act-observability-squad @VidyaKukke
-/src/azure-cli/azure/cli/command_modules/eventhubs/ @Azure/act-observability-squad @v-ajnava
+/src/azure-cli/azure/cli/command_modules/dls/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/dms/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/eventgrid/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/eventhubs/ @Azure/act-observability-squad
 /src/azure-cli/azure/cli/command_modules/extension/ @Azure/act-codegen-extensibility-squad
 /src/azure-cli/azure/cli/command_modules/feedback/ @Azure/act-codegen-extensibility-squad
-/src/azure-cli/azure/cli/command_modules/hdinsight/ @Azure/act-codegen-extensibility-squad @aim-for-better
+/src/azure-cli/azure/cli/command_modules/hdinsight/ @Azure/act-codegen-extensibility-squad
 /src/azure-cli/azure/cli/command_modules/identity/ @Azure/act-identity-squad
 /src/azure-cli/azure/cli/command_modules/iot/ @Azure/act-observability-squad @digimaun
 /src/azure-cli/azure/cli/command_modules/keyvault/ @Azure/act-identity-squad
 /src/azure-cli/azure/cli/command_modules/monitor/ @Azure/act-observability-squad
-/src/azure-cli/azure/cli/command_modules/mysql/ @Azure/act-codegen-extensibility-squad @honghr
-/src/azure-cli/azure/cli/command_modules/natgateway/ @Azure/act-quality-productivity-squad @khannarheams
+/src/azure-cli/azure/cli/command_modules/mysql/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/natgateway/ @Azure/act-quality-productivity-squad
 /src/azure-cli/azure/cli/command_modules/network/ @Azure/act-quality-productivity-squad
-/src/azure-cli/azure/cli/command_modules/policyinsights/ @Azure/act-identity-squad @cheggert
-/src/azure-cli/azure/cli/command_modules/postgresql/ @Azure/act-codegen-extensibility-squad @arde0708
+/src/azure-cli/azure/cli/command_modules/policyinsights/ @Azure/act-identity-squad
+/src/azure-cli/azure/cli/command_modules/postgresql/ @Azure/act-codegen-extensibility-squad
 /src/azure-cli/azure/cli/command_modules/privatedns/ @Azure/act-quality-productivity-squad
 /src/azure-cli/azure/cli/command_modules/profile/ @Azure/act-identity-squad
-/src/azure-cli/azure/cli/command_modules/rdbms/ @Azure/act-codegen-extensibility-squad @arde0708 @alanenriqueo
+/src/azure-cli/azure/cli/command_modules/rdbms/ @Azure/act-codegen-extensibility-squad
 /src/azure-cli/azure/cli/command_modules/resource/ @Azure/act-identity-squad
 /src/azure-cli/azure/cli/command_modules/role/ @Azure/act-identity-squad
-/src/azure-cli/azure/cli/command_modules/search/ @Azure/act-codegen-extensibility-squad @huangbolun
-/src/azure-cli/azure/cli/command_modules/servicebus/ @Azure/act-observability-squad @v-ajnava
-/src/azure-cli/azure/cli/command_modules/serviceconnector/ @Azure/act-codegen-extensibility-squad @yungezz @houk-ms @xfz11
-/src/azure-cli/azure/cli/command_modules/servicefabric/ @Azure/act-observability-squad @QingChenmsft
-/src/azure-cli/azure/cli/command_modules/sql/ @Azure/act-codegen-extensibility-squad @jaredmoo
+/src/azure-cli/azure/cli/command_modules/search/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/servicebus/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/serviceconnector/ @Azure/act-codegen-extensibility-squad
+/src/azure-cli/azure/cli/command_modules/servicefabric/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/sql/ @Azure/act-codegen-extensibility-squad
 /src/azure-cli/azure/cli/command_modules/storage/ @Azure/act-codegen-extensibility-squad
-/src/azure-cli/azure/cli/command_modules/synapse/ @Azure/act-experience-enablement-squad @idear1203 @zesluo
+/src/azure-cli/azure/cli/command_modules/synapse/ @Azure/act-experience-enablement-squad
 /src/azure-cli/azure/cli/command_modules/util/ @Azure/act-platform-engineering-squad
-/src/azure-cli/azure/cli/command_modules/vm/ @Azure/act-observability-squad @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
-/src/azure-cli/azure/cli/command_modules/containerapp/ @Azure/act-observability-squad @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu
+/src/azure-cli/azure/cli/command_modules/vm/ @Azure/act-observability-squad
+/src/azure-cli/azure/cli/command_modules/containerapp/ @Azure/act-observability-squad @howang-ms @Juliehzl @Greedygre