diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2a65133c40c..fb2985b81b9 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
+*                         @truecharts/core-team @privatepuffin @stavros-k @alfi0812 @kqmaverick @Heavybullets8 @StevenMcElligott @xstar97
+/charts/**                @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97
 /charts/dev/**            @privatepuffin
 /charts/unstable/**       @privatepuffin
-/charts/library/**         @privatepuffin @stavros-k
+/charts/library/**        @privatepuffin @stavros-k
 /clustertool/**           @privatepuffin @stavros-k
-/website/**               @privatepuffin @alfi0812 @kqmaverick @StevenMcElligott @xstar97
+/website/**               @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97
 /.github/**               @privatepuffin @stavros-k
-/.github/README.md      @privatepuffin @alfi0812 @StevenMcElligott
+/.github/README.md        @privatepuffin @stavros-k @alfi0812 @StevenMcElligott
 /clusters/**              @privatepuffin
 /repositories/**          @privatepuffin
-**/docs/**                @privatepuffin @alfi0812 @kqmaverick  @StevenMcElligott @xstar97
+**/docs/**                @privatepuffin @stavros-k @alfi0812 @kqmaverick @StevenMcElligott @xstar97