diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 5fff9cef8c9..b04b75c2360 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -18,6 +18,7 @@ var (
 			Name:        "trimDefaults",
 			Description: "Use cue schema to remove values that will be applied automatically",
 			State:       FeatureStateBeta,
+			Owner:       grafanaAsCodeSquad,
 		},
 		{
 			Name:        "disableEnvelopeEncryption",
@@ -96,6 +97,7 @@ var (
 			Name:        "featureHighlights",
 			Description: "Highlight Grafana Enterprise features",
 			State:       FeatureStateStable,
+			Owner:       grafanaAsCodeSquad,
 		},
 		{
 			Name:        "dashboardComments",
@@ -191,6 +193,7 @@ var (
 			Description:     "Validate dashboard JSON POSTed to api/dashboards/db",
 			State:           FeatureStateBeta,
 			RequiresRestart: true,
+			Owner:           grafanaAsCodeSquad,
 		},
 		{
 			Name:         "autoMigrateGraphPanels",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index c6832e9bbe7..6bbba1461af 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -43,13 +43,10 @@ func TestFeatureToggleFiles(t *testing.T) {
 
 	ownerlessFeatures := map[string]bool{
 		"alertingBigTransactions":           true,
-		"trimDefaults":                      true,
 		"database_metrics":                  true,
 		"prometheusAzureOverrideAudience":   true,
-		"featureHighlights":                 true,
 		"tracing":                           true,
 		"cloudWatchDynamicLabels":           true,
-		"validateDashboardsOnSave":          true,
 		"prometheusWideSeries":              true,
 		"disableSecretsCompatibility":       true,
 		"logRequestsInstrumentedAsUnknown":  true,