diff --git a/features.md b/features.md
index e7b4d5264e7..7dee90e5076 100644
--- a/features.md
+++ b/features.md
@@ -60,7 +60,6 @@
| GCPCustomAPIEndpoints| | | Enabled | Enabled | | | Enabled | Enabled |
| GCPCustomAPIEndpointsInstall| | | Enabled | Enabled | | | Enabled | Enabled |
| GCPDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled |
-| GatewayAPIManagementMode| | | Enabled | Enabled | | | Enabled | Enabled |
| GomaxprocsInjection| | | Enabled | Enabled | | | Enabled | Enabled |
| HyperShiftOnlyDynamicResourceAllocation| Enabled | | Enabled | | Enabled | | Enabled | |
| ImageModeStatusReporting| | | Enabled | Enabled | | | Enabled | Enabled |
@@ -103,6 +102,7 @@
| ExternalOIDCWithUIDAndExtraClaimMappings| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ExternalOIDCWithUpstreamParity| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| GCPSovereignCloudInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
+| GatewayAPIManagementMode| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| GatewayAPIWithoutOLM| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ImageStreamImportMode| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| IngressControllerDynamicConfigurationManager| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index fbd82205222..64df9bddf37 100644
--- a/features/features.go
+++ b/features/features.go
@@ -978,7 +978,7 @@ var (
contactPerson("miciah").
productScope(ocpSpecific).
enhancementPR("https://github.com/openshift/enhancements/pull/2023").
- enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+ enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()
FeatureGateIngressControllerLBSecurityGroupsAWS = newFeatureGate("IngressControllerLBSecurityGroupsAWS").
diff --git a/operator/v1alpha1/zz_generated.crd-manifests/0000_50_ingress_02_ingresses.crd.yaml b/operator/v1alpha1/zz_generated.crd-manifests/0000_50_ingress_02_ingresses.crd.yaml
index 5be17494f65..8f9f60dc764 100644
--- a/operator/v1alpha1/zz_generated.crd-manifests/0000_50_ingress_02_ingresses.crd.yaml
+++ b/operator/v1alpha1/zz_generated.crd-manifests/0000_50_ingress_02_ingresses.crd.yaml
@@ -7,7 +7,6 @@ metadata:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,TechPreviewNoUpgrade
name: ingresses.operator.openshift.io
spec:
group: operator.openshift.io
diff --git a/payload-manifests/crds/0000_50_ingress_02_ingresses.crd.yaml b/payload-manifests/crds/0000_50_ingress_02_ingresses.crd.yaml
index 5be17494f65..8f9f60dc764 100644
--- a/payload-manifests/crds/0000_50_ingress_02_ingresses.crd.yaml
+++ b/payload-manifests/crds/0000_50_ingress_02_ingresses.crd.yaml
@@ -7,7 +7,6 @@ metadata:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
- release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,TechPreviewNoUpgrade
name: ingresses.operator.openshift.io
spec:
group: operator.openshift.io
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index bfa2114572e..b2ea508d64a 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -143,9 +143,6 @@
{
"name": "GCPDualStackInstall"
},
- {
- "name": "GatewayAPIManagementMode"
- },
{
"name": "GomaxprocsInjection"
},
@@ -322,6 +319,9 @@
{
"name": "GCPSovereignCloudInstall"
},
+ {
+ "name": "GatewayAPIManagementMode"
+ },
{
"name": "GatewayAPIWithoutOLM"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index d6de9d3da6f..85073396e8d 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -145,9 +145,6 @@
{
"name": "GCPDualStackInstall"
},
- {
- "name": "GatewayAPIManagementMode"
- },
{
"name": "GomaxprocsInjection"
},
@@ -324,6 +321,9 @@
{
"name": "GCPSovereignCloudInstall"
},
+ {
+ "name": "GatewayAPIManagementMode"
+ },
{
"name": "GatewayAPIWithoutOLM"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index 145f55f615f..862d99b5951 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -140,9 +140,6 @@
{
"name": "GCPDualStackInstall"
},
- {
- "name": "GatewayAPIManagementMode"
- },
{
"name": "GomaxprocsInjection"
},
@@ -313,6 +310,9 @@
{
"name": "GCPSovereignCloudInstall"
},
+ {
+ "name": "GatewayAPIManagementMode"
+ },
{
"name": "GatewayAPIWithoutOLM"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index 0b6fb6a75c1..646a29b373f 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -142,9 +142,6 @@
{
"name": "GCPDualStackInstall"
},
- {
- "name": "GatewayAPIManagementMode"
- },
{
"name": "GomaxprocsInjection"
},
@@ -315,6 +312,9 @@
{
"name": "GCPSovereignCloudInstall"
},
+ {
+ "name": "GatewayAPIManagementMode"
+ },
{
"name": "GatewayAPIWithoutOLM"
},