diff --git a/features.md b/features.md
index adfd5a7e76b..ac944f54022 100644
--- a/features.md
+++ b/features.md
@@ -22,7 +22,6 @@
| AWSClusterHostedDNSInstall| | | Enabled | Enabled | | | Enabled | Enabled |
| AWSDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled |
| AWSDualStackInstall| | | Enabled | Enabled | | | Enabled | Enabled |
-| AWSServiceLBNetworkSecurityGroup| | | Enabled | Enabled | | | Enabled | Enabled |
| AutomatedEtcdBackup| | | Enabled | Enabled | | | Enabled | Enabled |
| AzureClusterHostedDNSInstall| | | Enabled | Enabled | | | Enabled | Enabled |
| AzureDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled |
@@ -80,6 +79,7 @@
| VSphereHostVMGroupZonal| | | Enabled | Enabled | | | Enabled | Enabled |
| VSphereMixedNodeEnv| | | Enabled | Enabled | | | Enabled | Enabled |
| VolumeGroupSnapshot| | | Enabled | Enabled | | | Enabled | Enabled |
+| AWSServiceLBNetworkSecurityGroup| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| AzureWorkloadIdentity| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| BuildCSIVolumes| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| ConsolePluginContentSecurityPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 4504ddb8c30..62604b71b32 100644
--- a/features/features.go
+++ b/features/features.go
@@ -736,12 +736,12 @@ var (
mustRegister()
FeatureGateAWSServiceLBNetworkSecurityGroup = newFeatureGate("AWSServiceLBNetworkSecurityGroup").
- reportProblemsToJiraComponent("Cloud Compute / Cloud Controller Manager").
- contactPerson("mtulio").
- productScope(ocpSpecific).
- enhancementPR("https://github.com/openshift/enhancements/pull/1802").
- enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
- mustRegister()
+ reportProblemsToJiraComponent("Cloud Compute / Cloud Controller Manager").
+ contactPerson("mtulio").
+ productScope(ocpSpecific).
+ enhancementPR("https://github.com/openshift/enhancements/pull/1802").
+ enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default, configv1.OKD).
+ mustRegister()
FeatureGateImageVolume = newFeatureGate("ImageVolume").
reportProblemsToJiraComponent("Node").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 17caf4f0c04..4e35d8a5b00 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -24,9 +24,6 @@
{
"name": "AWSDualStackInstall"
},
- {
- "name": "AWSServiceLBNetworkSecurityGroup"
- },
{
"name": "AutomatedEtcdBackup"
},
@@ -251,6 +248,9 @@
}
],
"enabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "AzureWorkloadIdentity"
},
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
index ea3e6f2a366..4b3347ea7a7 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
@@ -26,9 +26,6 @@
{
"name": "AWSDualStackInstall"
},
- {
- "name": "AWSServiceLBNetworkSecurityGroup"
- },
{
"name": "AutomatedEtcdBackup"
},
@@ -253,6 +250,9 @@
}
],
"enabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "AzureWorkloadIdentity"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 2d988f4b40c..ab82f3be228 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -24,9 +24,6 @@
{
"name": "AWSDualStackInstall"
},
- {
- "name": "AWSServiceLBNetworkSecurityGroup"
- },
{
"name": "AutomatedEtcdBackup"
},
@@ -245,6 +242,9 @@
}
],
"enabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "AzureWorkloadIdentity"
},
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
index ba9f6f806f9..a67caf85770 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
@@ -26,9 +26,6 @@
{
"name": "AWSDualStackInstall"
},
- {
- "name": "AWSServiceLBNetworkSecurityGroup"
- },
{
"name": "AutomatedEtcdBackup"
},
@@ -247,6 +244,9 @@
}
],
"enabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
{
"name": "AzureWorkloadIdentity"
},