diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 75b629ba1e5..7e5fa6801c7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,10 +1,10 @@
 # Default code owners
-*                       @ornias1993
-/charts/stable/         @truecharts/stable-maintainers @ornias1993
-/charts/incubator/      @truecharts/incubator-maintainers @Ornias1993
-/charts/dependency/     @truecharts/premium-maintainers @ornias1993
-/charts/premium/     @truecharts/premium-maintainers @ornias1993
+*                       @truecharts/maintainers @ornias1993 @Alfi0812
+/charts/stable/         @truecharts/maintainers @ornias1993 
+/charts/incubator/      @truecharts/maintainers @Ornias1993
+/charts/dependency/     @truecharts/maintainers @ornias1993
+/charts/premium/        @truecharts/maintainers @ornias1993 @stavros-k
 /charts/dev/            @ornias1993
-/charts/unstable/            @ornias1993
-/.github/               @truecharts/ci-maintainers @ornias1993
-docs/                   @truecharts/docs-maintainers @ornias1993
+/charts/unstable/       @ornias1993
+/.github/               @ornias1993 @stavros-k
+docs/                   @truecharts/maintainers @ornias1993 @bitpushr