diff --git a/features.md b/features.md
index 5017c4b6b96..31e773075ba 100644
--- a/features.md
+++ b/features.md
@@ -5,6 +5,7 @@
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | ShortCertRotation| | | | | |  |
+| NoRegistryClusterOperations| | | | <span style="background-color: #519450">Enabled</span> | |  |
 | BootImageSkewEnforcement| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
diff --git a/features/features.go b/features/features.go
index 13f9787fa24..a9eab98520c 100644
--- a/features/features.go
+++ b/features/features.go
@@ -835,4 +835,12 @@ var (
 				enhancementPR("https://github.com/openshift/enhancements/pull/1792").
 				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 				mustRegister()
+
+	FeatureGateNoRegistryClusterOperations = newFeatureGate("NoRegistryClusterOperations").
+						reportProblemsToJiraComponent("Installer / Agent based installation").
+						contactPerson("andfasano").
+						productScope(ocpSpecific).
+						enhancementPR("https://github.com/openshift/enhancements/pull/1821").
+						enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade).
+						mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 707c84325de..ac27b6c5fb5 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -160,6 +160,9 @@
                     {
                         "name": "NewOLMWebhookProviderOpenshiftServiceCA"
                     },
+                    {
+                        "name": "NoRegistryClusterOperations"
+                    },
                     {
                         "name": "NodeSwap"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index 99845508dc9..977b88da8ba 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -42,6 +42,9 @@
                     {
                         "name": "NewOLMWebhookProviderOpenshiftServiceCA"
                     },
+                    {
+                        "name": "NoRegistryClusterOperations"
+                    },
                     {
                         "name": "ShortCertRotation"
                     }
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 11eef37f0f2..32d053edcee 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -54,6 +54,9 @@
                     {
                         "name": "NewOLMWebhookProviderOpenshiftServiceCA"
                     },
+                    {
+                        "name": "NoRegistryClusterOperations"
+                    },
                     {
                         "name": "SELinuxMount"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 0ce39c27f2b..d59b13c4c84 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -160,6 +160,9 @@
                     {
                         "name": "NewOLMWebhookProviderOpenshiftServiceCA"
                     },
+                    {
+                        "name": "NoRegistryClusterOperations"
+                    },
                     {
                         "name": "NodeSwap"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 9910bd7cdd3..43aa5895e19 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -230,6 +230,9 @@
                     {
                         "name": "NewOLMWebhookProviderOpenshiftServiceCA"
                     },
+                    {
+                        "name": "NoRegistryClusterOperations"
+                    },
                     {
                         "name": "NodeSwap"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 6053cc3db0e..ca476208784 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -39,6 +39,9 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
+                    {
+                        "name": "NoRegistryClusterOperations"
+                    },
                     {
                         "name": "SELinuxMount"
                     },