diff --git a/features.md b/features.md
index 34976ca446e..21e0fde024c 100644
--- a/features.md
+++ b/features.md
@@ -3,7 +3,6 @@
 | ClientsAllowCBOR| | | | | |  |
 | ClusterAPIInstall| | | | | |  |
 | EventedPLEG| | | | | |  |
-| GatewayAPIWithoutOLM| | | | | |  |
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | NewOLMBoxCutterRuntime| | | | | |  |
@@ -87,6 +86,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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GatewayAPI| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GatewayAPIController| <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> | <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | HighlyAvailableArbiter| <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> | <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ImageVolume| <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> | <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 fa4250a14e8..2c14c68d91f 100644
--- a/features/features.go
+++ b/features/features.go
@@ -951,5 +951,6 @@ var (
                                     contactPerson("miciah").
                                     productScope(ocpSpecific).
                                     enhancementPR("https://github.com/openshift/enhancements/pull/1933").
+                                    enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
                                     mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 718947bc547..fc4e97e8fb0 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -114,9 +114,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "ImageModeStatusReporting"
                     },
@@ -272,6 +269,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index d02e8d205fe..d5648b62176 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -23,9 +23,6 @@
                     {
                         "name": "EventedPLEG"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "MachineAPIOperatorDisableMachineHealthCheckController"
                     },
@@ -190,6 +187,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 1025f584e35..acde7c3c8c6 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -32,9 +32,6 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "KMSEncryptionProvider"
                     },
@@ -196,6 +193,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 2c7276ba9ba..d42956097d4 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -114,9 +114,6 @@
                     {
                         "name": "GCPDualStackInstall"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "HyperShiftOnlyDynamicResourceAllocation"
                     },
@@ -269,6 +266,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 0b42d944ab6..cc03f2adf55 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -23,9 +23,6 @@
                     {
                         "name": "EventedPLEG"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "HyperShiftOnlyDynamicResourceAllocation"
                     },
@@ -175,6 +172,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 0d3376dbcc0..c8bf4281520 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -32,9 +32,6 @@
                     {
                         "name": "ExternalSnapshotMetadata"
                     },
-                    {
-                        "name": "GatewayAPIWithoutOLM"
-                    },
                     {
                         "name": "HyperShiftOnlyDynamicResourceAllocation"
                     },
@@ -181,6 +178,9 @@
                     {
                         "name": "GatewayAPIController"
                     },
+                    {
+                        "name": "GatewayAPIWithoutOLM"
+                    },
                     {
                         "name": "HighlyAvailableArbiter"
                     },