diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index d457e60b206..60c42bbc48c 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -311,7 +311,7 @@ var (
 			Description:       "Enables previous SQL data source dataset dropdown behavior",
 			FrontendOnly:      true,
 			Stage:             FeatureStagePublicPreview,
-			Owner:             grafanaDatavizSquad,
+			Owner:             grafanaOSSBigTent,
 			HideFromAdminPage: true,
 		},
 		{
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 968b1ca6dfa..8c51c058b15 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -39,7 +39,7 @@ lokiPredefinedOperations,experimental,@grafana/observability-logs,false,false,tr
 pluginsFrontendSandbox,privatePreview,@grafana/plugins-platform-backend,false,false,false
 frontendSandboxMonitorOnly,privatePreview,@grafana/plugins-platform-backend,false,false,true
 pluginsDetailsRightPanel,GA,@grafana/plugins-platform-backend,false,false,true
-sqlDatasourceDatabaseSelection,preview,@grafana/dataviz-squad,false,false,true
+sqlDatasourceDatabaseSelection,preview,@grafana/oss-big-tent,false,false,true
 recordedQueriesMulti,GA,@grafana/observability-metrics,false,false,false
 logsExploreTableVisualisation,GA,@grafana/observability-logs,false,false,true
 awsDatasourcesTempCredentials,experimental,@grafana/aws-datasources,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 0ee2d082a83..66188412168 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -2866,13 +2866,16 @@
     {
       "metadata": {
         "name": "sqlDatasourceDatabaseSelection",
-        "resourceVersion": "1743693517832",
-        "creationTimestamp": "2023-06-06T16:28:52Z"
+        "resourceVersion": "1744189713698",
+        "creationTimestamp": "2023-06-06T16:28:52Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-04-09 09:08:33.698779 +0000 UTC"
+        }
       },
       "spec": {
         "description": "Enables previous SQL data source dataset dropdown behavior",
         "stage": "preview",
-        "codeowner": "@grafana/dataviz-squad",
+        "codeowner": "@grafana/oss-big-tent",
         "frontend": true,
         "hideFromAdminPage": true
       }