diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 745034d80fc..7a911f0a45b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,8 +1,8 @@
 # Default code owners
-*                       @truecharts/core-team @ornias1993 @alfi0812 @kqmaverick @Heavybullets8 @bakayukii
-/charts/dev/            @ornias1993
-/charts/unstable/       @ornias1993
-/.github/CODEOWNERS     @ornias1993 @stavros-k
-/.github/scripts/       @ornias1993 @stavros-k
-/.github/workflows/     @ornias1993 @stavros-k
-/.github/renovate.json5 @ornias1993 @stavros-k
+*                       @truecharts/core-team @privatepuffin @alfi0812 @kqmaverick @Heavybullets8 @bakayukii
+/charts/dev/            @privatepuffin
+/charts/unstable/       @privatepuffin
+/.github/CODEOWNERS     @privatepuffin @stavros-k
+/.github/scripts/       @privatepuffin @stavros-k
+/.github/workflows/     @privatepuffin @stavros-k
+/.github/renovate.json5 @privatepuffin @stavros-k