diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 94c6195d5..bdfd0c393 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -25,11 +25,11 @@
 /sdk/storage/            @vinjiang @katmsft @Jinming-Hu @antkmsft @rickwinter @vhvb1989 @gearama
 
 # PRLabel: %EngSys
-/sdk/template/           @danieljurek @Azure/azure-sdk-eng
+/sdk/template/           @danieljurek @weshaggard
 
 ###########
 # Eng Sys
 ###########
-/eng/                    @danieljurek @azure/azure-sdk-eng
-/**/ci.yml               @danieljurek @azure/azure-sdk-eng
-/**/tests.yml            @danieljurek @azure/azure-sdk-eng
+/eng/                    @danieljurek @weshaggard @benbp
+/**/ci.yml               @danieljurek
+/**/tests.yml            @danieljurek