diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 39e0af410d..d8572c5e51 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,19 +1,12 @@
 # Instructions for CODEOWNERS file format and automatic build failure notifications:
 # https://github.com/Azure/azure-sdk/blob/main/docs/policies/opensource.md#codeowners
 
-################
-# Automation
-################
-
-# Git Hub integration and bot rules
-/.github/                @jsquire @rickwinter @ronniegeraghty
-
 ###########
 # SDK
 ###########
 
 # Catch all for non-code project files and unowned files | folders
-*                        @rickwinter @ahsonkhan @antkmsft @vhvb1989 @gearama @LarryOsterman
+/**                        @rickwinter @ahsonkhan @antkmsft @vhvb1989 @gearama @LarryOsterman
 /sdk/                    @rickwinter @ahsonkhan @antkmsft @vhvb1989 @gearama @LarryOsterman
 
 # Samples
@@ -41,9 +34,14 @@
 # PRLabel: %EngSys
 /sdk/template/           @danieljurek @weshaggard
 
+################
+# Automation
+################
+
+# Git Hub integration and bot rules
+/.github/                @jsquire @rickwinter @ronniegeraghty
+
 ###########
 # Eng Sys
 ###########
 /eng/                    @danieljurek @weshaggard @benbp
-/**/ci.yml               @danieljurek
-/**/tests.yml            @danieljurek