diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b8376bbd187..6803df1bf72 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -111,6 +111,7 @@ var (
 			Name:        "migrationLocking",
 			Description: "Lock database during migrations",
 			State:       FeatureStateBeta,
+			Owner:       grafanaBackendPlatformSquad,
 		},
 		{
 			Name:        "storage",
@@ -294,6 +295,7 @@ var (
 			Name:        "mysqlAnsiQuotes",
 			Description: "Use double quotes to escape keyword in a MySQL query",
 			State:       FeatureStateAlpha,
+			Owner:       grafanaBackendPlatformSquad,
 		},
 		{
 			Name:        "accessControlOnCall",
@@ -305,6 +307,7 @@ var (
 			Description:     "Enable folder nesting",
 			State:           FeatureStateAlpha,
 			RequiresDevMode: true,
+			Owner:           grafanaBackendPlatformSquad,
 		},
 		{
 			Name:        "accessTokenExpirationCheck",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index 0637408e794..455787a946f 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -49,7 +49,6 @@ func TestFeatureToggleFiles(t *testing.T) {
 		"prometheusAzureOverrideAudience":   true,
 		"lokiDataframeApi":                  true,
 		"featureHighlights":                 true,
-		"migrationLocking":                  true,
 		"exploreMixedDatasource":            true,
 		"tracing":                           true,
 		"newTraceView":                      true,
@@ -66,9 +65,7 @@ func TestFeatureToggleFiles(t *testing.T) {
 		"athenaAsyncQueryDataSupport":       true,
 		"newPanelChromeUI":                  true,
 		"showDashboardValidationWarnings":   true,
-		"mysqlAnsiQuotes":                   true,
 		"accessControlOnCall":               true,
-		"nestedFolders":                     true,
 		"accessTokenExpirationCheck":        true,
 		"elasticsearchBackendMigration":     true,
 		"datasourceOnboarding":              true,