diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a27be4d5158..d7ac7a8e48e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,13 +1,13 @@
 # Default code owners
 *                       @truecharts/core-team @privatepuffin @alfi0812 @kqmaverick @Heavybullets8
-/charts/                @privatepuffin @alfi0812 @kqmaverick @Heavybullets8 @StevenMcElligott @xstar97
-/charts/dev/            @privatepuffin
-/charts/unstable/       @privatepuffin
-/charts/common/         @privatepuffin @stavros-k
-/clustertool/           @privatepuffin @stavros-k
-/website/               @privatepuffin @alfi0812 @kqmaverick @StevenMcElligott @xstar97
-/.github/               @privatepuffin @stavros-k
+/charts/**                @privatepuffin @alfi0812 @kqmaverick @Heavybullets8 @StevenMcElligott @xstar97
+/charts/dev/**            @privatepuffin
+/charts/unstable/**       @privatepuffin
+/charts/common/**         @privatepuffin @stavros-k
+/clustertool/**           @privatepuffin @stavros-k
+/website/**               @privatepuffin @alfi0812 @kqmaverick @StevenMcElligott @xstar97
+/.github/**               @privatepuffin @stavros-k
 /.github/README.md      @privatepuffin @alfi0812 @StevenMcElligott
-/clusters/              @privatepuffin
-/repositories/          @privatepuffin
-**/docs/                @privatepuffin @alfi0812 @kqmaverick  @StevenMcElligott @xstar97
+/clusters/**              @privatepuffin
+/repositories/**          @privatepuffin
+**/docs/**                @privatepuffin @alfi0812 @kqmaverick  @StevenMcElligott @xstar97