diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e3bf377235..b049971a38 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,16 +7,16 @@
 /admission-server/ @JivusAyrus @StarpTech @thisisnithin
 /cdn-server/ @JivusAyrus @StarpTech @thisisnithin
 /cli/ @endigma @JivusAyrus @StarpTech @jensneuse @endigma
-/composition/ @Aenimus @JivusAyrus @StarpTech
-/composition-go/ @Aenimus @JivusAyrus @StarpTech @jensneuse
+/composition/ @Aenimus @JivusAyrus @StarpTech @thisisnithin
+/composition-go/ @Aenimus @JivusAyrus @StarpTech @jensneuse @thisisnithin
 /connect/ @Aenimus @JivusAyrus @StarpTech @jensneuse @endigma
 /connect-go/ @Aenimus @JivusAyrus @StarpTech @jensneuse @endigma
 /controlplane/ @JivusAyrus @wilsonrivera @StarpTech @thisisnithin
-/graphqlmetrics/ @Noroth @StarpTech @miklosbarabas
-/helm/ @Noroth @StarpTech @miklosbarabas
-/infrastructure/ @Noroth @StarpTech @miklosbarabas
+/graphqlmetrics/ @Noroth @StarpTech
+/helm/ @Noroth @StarpTech
+/infrastructure/ @Noroth @StarpTech
 /keycloak/ @JivusAyrus @wilsonrivera @StarpTech @thisisnithin
-/otelcollector/ @Noroth @StarpTech @miklosbarabas
+/otelcollector/ @Noroth @StarpTech
 /playground/ @wundergraph/Router @thisisnithin @StarpTech
 /proto/ @JivusAyrus @wilsonrivera @StarpTech @endigma
 /protographic/ @Noroth @StarpTech @endigma