diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 353b0f9873d..97d6b8883f1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -114,7 +114,6 @@
 /pkg/services/notifications/ @grafana/backend-platform
 /pkg/services/org/ @grafana/backend-platform
 /pkg/services/playlist/ @grafana/grafana-app-platform-squad
-/pkg/services/plugindashboards/ @grafana/backend-platform
 /pkg/services/preference/ @grafana/backend-platform
 /pkg/services/provisioning/ @grafana/backend-platform
 /pkg/services/query/ @grafana/backend-platform
@@ -147,7 +146,6 @@
 /pkg/util/ @grafana/backend-platform
 /pkg/web/ @grafana/backend-platform
 
-/pkg/services/grpcserver/ @grafana/backend-platform
 /pkg/infra/kvstore/ @grafana/backend-platform
 /pkg/infra/fs/ @grafana/backend-platform
 /pkg/infra/x/ @grafana/backend-platform
@@ -270,6 +268,7 @@
 /pkg/util/converter/ @grafana/grafana-app-platform-squad
 /pkg/modules/ @grafana/grafana-app-platform-squad
 /pkg/kindsysreport/ @grafana/grafana-app-platform-squad
+/pkg/services/grpcserver/ @grafana/grafana-app-platform-squad
 
 # Alerting
 /pkg/services/ngalert/ @grafana/alerting-backend-product
@@ -293,6 +292,7 @@
 /pkg/tsdb/grafana-testdata-datasource/ @grafana/plugins-platform-backend
 /pkg/tsdb/Magefile.go @grafana/plugins-platform-backend
 /pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend
+/pkg/services/plugindashboards/ @grafana/plugins-platform-backend
 
 # Backend code docs
 /contribute/backend/ @grafana/backend-platform