diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5e0358e41..b5731024c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,8 +6,14 @@
 ###########
 
 # Catch all for non-code project files and unowned files | folders
-/**                      @rickwinter @LarryOsterman
-/sdk/                    @rickwinter @LarryOsterman
+# /**
+
+#Catch all for files at the root
+/*                        @rickwinter @LarryOsterman @ahsonkhan @antkmsft @gearama
+/sdk/                    @rickwinter
+
+# Git Hub integration and bot rules
+/.github/              @rickwinter @ronniegeraghty
 
 # Samples
 /samples/                @rickwinter @ahsonkhan @antkmsft @gearama @LarryOsterman