diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index 3760429e84d..7efd1387316 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -12,4 +12,5 @@ const (
 	grafanaUserEssentialsSquad  codeowner = "@grafana/user-essentials"
 	grafanaBackendPlatformSquad codeowner = "@grafana/backend-platform"
 	grafanaPluginsPlatformSquad codeowner = "@grafana/plugins-platform-backend"
+	grafanaAuthnzSquad          codeowner = "@grafana/grafana-authnz-team"
 )
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 6803df1bf72..bfd6486d37b 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -301,6 +301,7 @@ var (
 			Name:        "accessControlOnCall",
 			Description: "Access control primitives for OnCall",
 			State:       FeatureStateBeta,
+			Owner:       grafanaAuthnzSquad,
 		},
 		{
 			Name:            "nestedFolders",
@@ -313,6 +314,7 @@ var (
 			Name:        "accessTokenExpirationCheck",
 			Description: "Enable OAuth access_token expiration check and token refresh using the refresh_token",
 			State:       FeatureStateStable,
+			Owner:       grafanaAuthnzSquad,
 		},
 		{
 			Name:        "elasticsearchBackendMigration",
@@ -333,6 +335,7 @@ var (
 			Name:        "authnService",
 			Description: "Use new auth service to perform authentication",
 			State:       FeatureStateAlpha,
+			Owner:       grafanaAuthnzSquad,
 		},
 		{
 			Name:        "disablePrometheusExemplarSampling",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index 455787a946f..efce45e3a90 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -65,12 +65,9 @@ func TestFeatureToggleFiles(t *testing.T) {
 		"athenaAsyncQueryDataSupport":       true,
 		"newPanelChromeUI":                  true,
 		"showDashboardValidationWarnings":   true,
-		"accessControlOnCall":               true,
-		"accessTokenExpirationCheck":        true,
 		"elasticsearchBackendMigration":     true,
 		"datasourceOnboarding":              true,
 		"secureSocksDatasourceProxy":        true,
-		"authnService":                      true,
 		"disablePrometheusExemplarSampling": true,
 		"alertingBacktesting":               true,
 		"alertingNoNormalState":             true,