diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 596a0e198e1..f40374e60ba 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,11 +1,18 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
 
-* @jongio @ellismg
-/cli/ @ellismg @wbreza @vhvb1989 @hemarina @jongio @weikanglim
-/cli/installer @ellismg @danieljurek
-/ext/ @karolz-ms @ellismg @jongio
+/**               @jongio @ellismg
+
+/cli/             @ellismg @wbreza @vhvb1989 @hemarina @jongio @weikanglim
+/cli/installer/   @ellismg @danieljurek
+
+/ext/             @karolz-ms @ellismg @jongio
+
 /generators/repo/ @wbreza @ellismg @danieljurek
-/.github/ @danieljurek @ellismg
-/eng/ @danieljurek @ellismg
-/schemas/ @jongio @karolz-ms @ellismg @wbreza
-/templates/ @jongio @wbreza
+
+/.github/         @danieljurek @ellismg
+
+/eng/             @danieljurek @ellismg
+
+/schemas/         @jongio @karolz-ms @ellismg @wbreza
+
+/templates/       @jongio @wbreza