diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6809108995..5674889143 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 @ronniegeraghty
-
 ###########
 # SDK
 ###########
 
 # Catch all for non-code project files
-* @rickwinter
+/** @rickwinter
 
 # SDK team
 /sdk/ @rickwinter
@@ -23,24 +16,30 @@
 
 # Service teams
 # Core
-sdk/docs/core/                @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
-sdk/inc/azure/core/           @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
-sdk/samples/core/             @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
-sdk/src/azure/core/           @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
-sdk/tests/core/               @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
+/sdk/docs/core/                @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
+/sdk/inc/azure/core/           @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
+/sdk/samples/core/             @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
+/sdk/src/azure/core/           @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
+/sdk/tests/core/               @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
 
 # IoT
-sdk/docs/iot/                 @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
-sdk/inc/azure/iot/            @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
-sdk/samples/iot/              @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
-sdk/src/azure/iot/            @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
-sdk/tests/iot/                @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
+/sdk/docs/iot/                 @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
+/sdk/inc/azure/iot/            @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
+/sdk/samples/iot/              @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
+/sdk/src/azure/iot/            @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
+/sdk/tests/iot/                @CIPop @danewalton @ericwol-msft @ewertons @josesanchez7 @jspaith @preethi826 @RLeclair @vaavva
 
 # Platform
-sdk/src/azure/platform/       @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
+/sdk/src/azure/platform/       @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
+
+################
+# Automation
+################
+
+# Git Hub integration and bot rules
+/.github/                     @jsquire @ronniegeraghty
 
 ###########
 # Eng Sys
 ###########
 /eng/       @danieljurek @weshaggard @benbp
-/**/ci.yml  @danieljurek