diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7ce2a910e6d..27019ee64f9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -610,9 +610,12 @@ playwright.config.ts @grafana/plugins-platform-frontend
 
 # Grafana Operator Experience Team
 /pkg/services/caching/ @grafana/grafana-operator-experience-squad
-/pkg/services/featuremgmt/ @grafana/grafana-operator-experience-squad
 /pkg/services/cloudmigration/ @grafana/grafana-operator-experience-squad
 
+# Feature toggles
+/pkg/services/featuremgmt/ @grafana/grafana-backend-services-squad 
+
+
 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
 /kinds/ @grafana/grafana-as-code