diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 23387790e0b..1636366074d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,9 +1,9 @@
 # Default code owners
-*      @ornias1993
-*      @truecharts-admin
-/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
+*                       @ornias1993
+/charts/stable/         @truecharts/stable-maintainers @ornias1993
+/charts/incubator/      @truecharts/incubator-maintainers @Ornias1993
+/charts/dependency/     @truecharts/enterprise-maintainers @ornias1993
+/charts/enterprise/     @truecharts/enterprise-maintainers @ornias1993
+/charts/dev/            @ornias1993
+/.github/               @truecharts/ci-maintainers @ornias1993 
+docs/                   @truecharts/docs-maintainers @ornias1993