diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 5b45c8a17dd..087b7327b81 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -560,21 +560,21 @@ var (
 			Name:            "queryService",
 			Description:     "Register /apis/query.grafana.app/ -- will eventually replace /api/ds/query",
 			Stage:           FeatureStageExperimental,
-			Owner:           grafanaAppPlatformSquad,
+			Owner:           grafanaDatasourcesCoreServicesSquad,
 			RequiresRestart: true, // Adds a route at startup
 		},
 		{
 			Name:            "queryServiceRewrite",
 			Description:     "Rewrite requests targeting /ds/query to the query service",
 			Stage:           FeatureStageExperimental,
-			Owner:           grafanaAppPlatformSquad,
+			Owner:           grafanaDatasourcesCoreServicesSquad,
 			RequiresRestart: true, // changes the API routing
 		},
 		{
 			Name:         "queryServiceFromUI",
 			Description:  "Routes requests to the new query service",
 			Stage:        FeatureStageExperimental,
-			Owner:        grafanaAppPlatformSquad,
+			Owner:        grafanaDatasourcesCoreServicesSquad,
 			FrontendOnly: true, // and can change at startup
 		},
 		{
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 879a3810a37..fe9151fc18c 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -72,9 +72,9 @@ dashboardDisableSchemaValidationV1,experimental,@grafana/grafana-app-platform-sq
 dashboardDisableSchemaValidationV2,experimental,@grafana/grafana-app-platform-squad,false,false,false
 dashboardSchemaValidationLogging,experimental,@grafana/grafana-app-platform-squad,false,false,false
 datasourceQueryTypes,experimental,@grafana/grafana-app-platform-squad,false,true,false
-queryService,experimental,@grafana/grafana-app-platform-squad,false,true,false
-queryServiceRewrite,experimental,@grafana/grafana-app-platform-squad,false,true,false
-queryServiceFromUI,experimental,@grafana/grafana-app-platform-squad,false,false,true
+queryService,experimental,@grafana/grafana-datasources-core-services,false,true,false
+queryServiceRewrite,experimental,@grafana/grafana-datasources-core-services,false,true,false
+queryServiceFromUI,experimental,@grafana/grafana-datasources-core-services,false,false,true
 queryServiceFromExplore,experimental,@grafana/grafana-datasources-core-services,false,false,true
 cloudWatchBatchQueries,preview,@grafana/aws-datasources,false,false,false
 recoveryThreshold,GA,@grafana/alerting-squad,false,true,false
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 7d130cc9df4..4a11a5109c7 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -2462,13 +2462,16 @@
     {
       "metadata": {
         "name": "queryService",
-        "resourceVersion": "1745339544057",
-        "creationTimestamp": "2024-04-19T09:26:21Z"
+        "resourceVersion": "1745480536808",
+        "creationTimestamp": "2024-04-19T09:26:21Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-04-24 07:42:16.80869 +0000 UTC"
+        }
       },
       "spec": {
         "description": "Register /apis/query.grafana.app/ -- will eventually replace /api/ds/query",
         "stage": "experimental",
-        "codeowner": "@grafana/grafana-app-platform-squad",
+        "codeowner": "@grafana/grafana-datasources-core-services",
         "requiresRestart": true
       }
     },
@@ -2488,26 +2491,32 @@
     {
       "metadata": {
         "name": "queryServiceFromUI",
-        "resourceVersion": "1745339544057",
-        "creationTimestamp": "2024-04-19T09:26:21Z"
+        "resourceVersion": "1745480536808",
+        "creationTimestamp": "2024-04-19T09:26:21Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-04-24 07:42:16.80869 +0000 UTC"
+        }
       },
       "spec": {
         "description": "Routes requests to the new query service",
         "stage": "experimental",
-        "codeowner": "@grafana/grafana-app-platform-squad",
+        "codeowner": "@grafana/grafana-datasources-core-services",
         "frontend": true
       }
     },
     {
       "metadata": {
         "name": "queryServiceRewrite",
-        "resourceVersion": "1745339544057",
-        "creationTimestamp": "2024-04-19T09:26:21Z"
+        "resourceVersion": "1745480536808",
+        "creationTimestamp": "2024-04-19T09:26:21Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-04-24 07:42:16.80869 +0000 UTC"
+        }
       },
       "spec": {
         "description": "Rewrite requests targeting /ds/query to the query service",
         "stage": "experimental",
-        "codeowner": "@grafana/grafana-app-platform-squad",
+        "codeowner": "@grafana/grafana-datasources-core-services",
         "requiresRestart": true
       }
     },