diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 34f7c7b1707..dbb783d1680 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -40,14 +40,14 @@
 /src/azure-cli/azure/cli/command_modules/dls/ @jsntcy @calvinhzy @akharit @rahuldutta90
 /src/azure-cli/azure/cli/command_modules/dms/ @jsntcy @necusjz @temandr @binuj
 /src/azure-cli/azure/cli/command_modules/eventgrid/ @calvinhzy @VidyaKukke
-/src/azure-cli/azure/cli/command_modules/eventhubs/ @jsntcy @v-ajnava
+/src/azure-cli/azure/cli/command_modules/eventhubs/ @jsntcy @v-ajnava @calvinhzy
 /src/azure-cli/azure/cli/command_modules/extension/ @jsntcy @kairu-ms
 /src/azure-cli/azure/cli/command_modules/feedback/ @jiasli @kairu-ms
 /src/azure-cli/azure/cli/command_modules/hdinsight/ @kairu-ms @aim-for-better
 /src/azure-cli/azure/cli/command_modules/identity/ @jiasli @yanzhudd
 /src/azure-cli/azure/cli/command_modules/iot/ @yanzhudd @digimaun
 /src/azure-cli/azure/cli/command_modules/keyvault/ @notyashhh @jiasli @calvinhzy
-/src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms @necusjz @AllyW
+/src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms @necusjz @yanzhudd
 /src/azure-cli/azure/cli/command_modules/mysql/ @calvinhzy @honghr
 /src/azure-cli/azure/cli/command_modules/natgateway/ @jsntcy @kairu-ms @necusjz @khannarheams
 /src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007 @necusjz @DanielMicrosoft @ReaNAiveD