diff --git a/features.md b/features.md
index 025ed84f94f..f4ad4d60509 100644
--- a/features.md
+++ b/features.md
@@ -5,13 +5,13 @@
 | EventedPLEG| | | | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | | | |  |
 | MultiArchInstallAzure| | | | | | | |  |
-| NewOLMBoxCutterRuntime| | | | | | | |  |
 | ShortCertRotation| | | | | | | |  |
 | ClusterAPIMachineManagementVSphere| | | <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> | | | |  |
 | ExternalSnapshotMetadata| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | IngressControllerDynamicConfigurationManager| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | NetworkConnect| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
+| NewOLMBoxCutterRuntime| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMCatalogdAPIV1Metas| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NewOLMPreflightPermissionChecks| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | NoRegistryClusterInstall| | | | <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 289cf106bdc..d83032c4f60 100644
--- a/features/features.go
+++ b/features/features.go
@@ -212,12 +212,12 @@ var (
 					mustRegister()
 
 	FeatureGateEVPN = newFeatureGate("EVPN").
-				reportProblemsToJiraComponent("Networking/ovn-kubernetes").
-				contactPerson("jcaamano").
-				productScope(ocpSpecific).
-				enhancementPR("https://github.com/openshift/enhancements/pull/1862").
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
+			reportProblemsToJiraComponent("Networking/ovn-kubernetes").
+			contactPerson("jcaamano").
+			productScope(ocpSpecific).
+			enhancementPR("https://github.com/openshift/enhancements/pull/1862").
+			enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+			mustRegister()
 
 	FeatureGateNetworkLiveMigration = newFeatureGate("NetworkLiveMigration").
 					reportProblemsToJiraComponent("Networking/ovn-kubernetes").
@@ -526,6 +526,7 @@ var (
 						contactPerson("pegoncal").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1890").
+						enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather").
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 53a9fe42a7f..8c490da259f 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -32,9 +32,6 @@
                     {
                         "name": "MultiArchInstallAzure"
                     },
-                    {
-                        "name": "NewOLMBoxCutterRuntime"
-                    },
                     {
                         "name": "ShortCertRotation"
                     }
@@ -271,6 +268,9 @@
                     {
                         "name": "NewOLM"
                     },
+                    {
+                        "name": "NewOLMBoxCutterRuntime"
+                    },
                     {
                         "name": "NewOLMCatalogdAPIV1Metas"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 3fd201be1d8..78cf1f032e3 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -47,9 +47,6 @@
                     {
                         "name": "NetworkConnect"
                     },
-                    {
-                        "name": "NewOLMBoxCutterRuntime"
-                    },
                     {
                         "name": "ProvisioningRequestAvailable"
                     },
@@ -274,6 +271,9 @@
                     {
                         "name": "NewOLM"
                     },
+                    {
+                        "name": "NewOLMBoxCutterRuntime"
+                    },
                     {
                         "name": "NewOLMCatalogdAPIV1Metas"
                     },