diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1320580d51c..50763ab57b0 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
+/charts/                @privatepuffin @alfi0812 @kqmaverick @Heavybullets8 @StevenMcElligott @Xstar97TheNoob
 /charts/dev/            @privatepuffin
 /charts/unstable/       @privatepuffin
 /charts/common/         @privatepuffin @stavros-k
 /clustertool/           @privatepuffin @stavros-k
-/website/               @privatepuffin @alfi0812 @kqmaverick @StevenMcElligott
+/website/               @privatepuffin @alfi0812 @kqmaverick @StevenMcElligott @Xstar97TheNoob
 /.github/               @privatepuffin @stavros-k
 /.github/README.md      @privatepuffin @alfi0812 @StevenMcElligott
 /clusters/              @privatepuffin
 /repositories/          @privatepuffin
-**/docs/                @privatepuffin @alfi0812 @kqmaverick  @StevenMcElligott
+**/docs/                @privatepuffin @alfi0812 @kqmaverick  @StevenMcElligott @Xstar97TheNoob