diff --git a/features.md b/features.md
index 946082f5069..d25c7f3a490 100644
--- a/features.md
+++ b/features.md
@@ -2,7 +2,6 @@
 | ------ | --- | --- | --- | --- | --- | ---  |
 | ClusterAPIInstall| | | | | |  |
 | EventedPLEG| | | | | |  |
-| GatewayAPIWithoutOLM| | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | ShortCertRotation| | | | | |  |
@@ -38,6 +37,7 @@
 | GCPClusterHostedDNSInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GCPCustomAPIEndpoints| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GCPCustomAPIEndpointsInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| GatewayAPIWithoutOLM| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ImageModeStatusReporting| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ImageStreamImportMode| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <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> | <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 db366cb3a83..f4b105cd9ab 100644
--- a/features/features.go
+++ b/features/features.go
@@ -852,5 +852,6 @@ var (
 						contactPerson("miciah").
 						productScope(ocpSpecific).
 						enhancementPR("https://github.com/openshift/enhancements/pull/1933").
+						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index 92c2e7b6075..9ec92277b1e 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -21,9 +21,6 @@
                     {
                         "name": "EventedPLEG"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -161,6 +158,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 5dd10f60d10..cfc96cfd897 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -30,9 +30,6 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -164,6 +161,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 3cd8f1a8717..86aaa381b36 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -21,9 +21,6 @@
                     {
                         "name": "EventedPLEG"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -143,6 +140,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 0f6f897db7e..20cdbe66166 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -30,9 +30,6 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -146,6 +143,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },