diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index 7efd1387316..2f746836f2c 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -12,5 +12,6 @@ const (
 	grafanaUserEssentialsSquad  codeowner = "@grafana/user-essentials"
 	grafanaBackendPlatformSquad codeowner = "@grafana/backend-platform"
 	grafanaPluginsPlatformSquad codeowner = "@grafana/plugins-platform-backend"
+	grafanaAsCodeSquad          codeowner = "@grafana/grafana-as-code"
 	grafanaAuthnzSquad          codeowner = "@grafana/grafana-authnz-team"
 )
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index bfd6486d37b..f5b5a9178ad 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -23,6 +23,7 @@ var (
 			Name:        "disableEnvelopeEncryption",
 			Description: "Disable envelope encryption (emergency only)",
 			State:       FeatureStateStable,
+			Owner:       grafanaAsCodeSquad,
 		},
 		{
 			Name:        "database_metrics",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index efce45e3a90..9da66f771b5 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -44,7 +44,6 @@ func TestFeatureToggleFiles(t *testing.T) {
 	ownerlessFeatures := map[string]bool{
 		"alertingBigTransactions":           true,
 		"trimDefaults":                      true,
-		"disableEnvelopeEncryption":         true,
 		"database_metrics":                  true,
 		"prometheusAzureOverrideAudience":   true,
 		"lokiDataframeApi":                  true,