diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a3c2b5012af..1c650f70601 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,9 +2,9 @@
 
 *help.py @sptramer
 
-/tools/ @troydai
-/scripts/ @troydai
-/src/azure-cli-testsdk/ @troydai
+/tools/ @tjprescott
+/scripts/ @tjprescott
+/src/azure-cli-testsdk/ @tjprescott
 /src/command_modules/azure-cli-acr/ @djyou
 /src/command_modules/azure-cli-acs/ @rjtsdl
 /src/command_modules/azure-cli-advisor/ @Prasanna-Padmanabhan
@@ -21,11 +21,11 @@
 /src/command_modules/azure-cli-eventgrid/ @kalyanaj
 /src/command_modules/azure-cli-extension/ @williexu
 /src/command_modules/azure-cli-keyvault/ @tjprescott
-/src/command_modules/azure-cli-monitor/ @troydai
+/src/command_modules/azure-cli-monitor/ @tjprescott
 /src/command_modules/azure-cli-network/ @tjprescott
 /src/command_modules/azure-cli-policyinsights/ @bulentelmaci
 /src/command_modules/azure-cli-profile/ @yugangw-msft
-/src/command_modules/azure-cli-storage/ @troydai @williexu
+/src/command_modules/azure-cli-storage/ @williexu
 /src/command_modules/azure-cli-servicefabric/ @QingChenmsft
 /src/command_modules/azure-cli-sql/ @jaredmoo
 /src/command_modules/azure-cli-vm/ @yugangw-msft