diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a786f8ca95b..51affa2d016 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1,11 @@
 # Default code owners
-*                         @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97
-/charts/**                @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97
-/charts/library/**        @privatepuffin @stavros-k
-/clustertool/**           @privatepuffin @stavros-k
-/clustertool/embed/**     @privatepuffin @stavros-k @alfi0812
+*                         @privatepuffin @stavros-k @alfi0812 @xstar97
+
+# Docs stuff
 /website/**               @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97
-/.github/**               @privatepuffin @stavros-k
-/.github/renovate/**      @privatepuffin @stavros-k @alfi0812
-/.github/renovate.json5   @privatepuffin @stavros-k @alfi0812
 /.github/README.md        @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97
+**/docs/**                @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97
+
+# Extra security due to directly being loaded onto the cluster
 /clusters/**              @privatepuffin
 /repositories/**          @privatepuffin
-**/docs/**                @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97