diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b5a7b51954c..93f07e14c99 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -69,6 +69,7 @@ var (
 			Name:        "prometheusAzureOverrideAudience",
 			Description: "Experimental. Allow override default AAD audience for Azure Prometheus endpoint",
 			State:       FeatureStateBeta,
+			Owner:       grafanaObservabilityMetricsSquad,
 		},
 		{
 			Name:        "publicDashboards",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index 85caf10901e..e55096e9476 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -41,26 +41,10 @@ func TestFeatureToggleFiles(t *testing.T) {
 		}
 	})
 
-	ownerlessFeatures := map[string]bool{
-		"prometheusAzureOverrideAudience": true,
-	}
-
 	t.Run("all new features should have an owner", func(t *testing.T) {
 		for _, flag := range standardFeatureFlags {
 			if flag.Owner == "" {
-				if _, ok := ownerlessFeatures[flag.Name]; !ok {
-					t.Errorf("feature %s does not have an owner", flag.Name)
-				}
-			}
-		}
-	})
-
-	t.Run("features with assigned owner should not be on the ownerless list", func(t *testing.T) {
-		for _, flag := range standardFeatureFlags {
-			if flag.Owner != "" {
-				if _, ok := ownerlessFeatures[flag.Name]; ok {
-					t.Errorf("feature %s should be removed from the ownerless list", flag.Name)
-				}
+				t.Errorf("feature %s does not have an owner. please fill the FeatureFlag.Owner property", flag.Name)
 			}
 		}
 	})