diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9656365be2c..85dbce77722 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,11 +1,9 @@
 # Default code owners
 *      @ornias1993
 *      @truecharts-admin
-/charts/stable/     @stavros-k
-/charts/incubator/       @stavros-k
-/charts/SCALE/      @ornias1993
-/charts/core/      @ornias1993
-/charts/dependency/      @ornias1993
-/charts/enterprise/      @ornias1993
-/charts/dev/      @ornias1993
-/docs/      @ornias1993 @stavros-k
+/charts/stable/     @truecharts/stable-maintainers @truecharts-admin @ornias1993
+/charts/incubator/       @truecharts/incubator-maintainers @truecharts-admin @ornias1993
+/charts/dependency/      @truecharts/enterprise-maintainers @truecharts-admin @ornias1993
+/charts/enterprise/      @truecharts/enterprise-maintainers @truecharts-admin @ornias1993
+/charts/dev/      @ornias1993 @truecharts-admin @ornias1993
+docs/      @truecharts/docs-maintainers @truecharts-admin @ornias1993