diff --git a/features.md b/features.md
index 5740fc034fb..7a38b5fd567 100644
--- a/features.md
+++ b/features.md
@@ -14,6 +14,7 @@
 | MutableTopology| | | | <span style="background-color: #519450">Enabled</span> | | | |  |
 | AuthenticationComponentProxy| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span>  |
 | BGPBasedVIPManagement| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
+| CapacityBufferAvailable| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | ClusterAPIComputeInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | ClusterAPIControlPlaneInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | |  |
 | ClusterUpdatePreflight| | | <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 9e1150f2d6a..a30f3053a02 100644
--- a/features/features.go
+++ b/features/features.go
@@ -1067,4 +1067,11 @@ var (
 					enhancementPR("https://github.com/openshift/enhancements/pull/2047").
 					enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
 					mustRegister()
+
+	FeatureGateCapacityBufferAvailable = newFeatureGate("CapacityBufferAvailable").
+						reportProblemsToJiraComponent("Cluster Autoscaler").
+						contactPerson("elmiko").
+						productScope(ocpSpecific).
+						enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
+						mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index fc3a3dc3a30..10dd58231c0 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -53,6 +53,9 @@
                     {
                         "name": "CRIOCredentialProviderConfig"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsAllowCBOR"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
index a857545a423..4ade0df21d7 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -135,6 +135,9 @@
                     {
                         "name": "CRDCompatibilityRequirementOperator"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsPreferCBOR"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index 1513fbdf881..e7f17a66799 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -55,6 +55,9 @@
                     {
                         "name": "CRIOCredentialProviderConfig"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsAllowCBOR"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
index 0aef14ca1a4..2a3d012c180 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -25,6 +25,9 @@
                     {
                         "name": "CRIOCredentialProviderConfig"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsAllowCBOR"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index 662bcb95df8..0a24c3bfcf6 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -50,6 +50,9 @@
                     {
                         "name": "CRDCompatibilityRequirementOperator"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsAllowCBOR"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 89c1963d9da..6d14ec46a51 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -108,6 +108,9 @@
                     {
                         "name": "CRIOCredentialProviderConfig"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsPreferCBOR"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index 1396a78cd0f..ef8b520a22d 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -52,6 +52,9 @@
                     {
                         "name": "CRDCompatibilityRequirementOperator"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsAllowCBOR"
                     },
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 0ae832f15bd..8fc18c18a8e 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -19,6 +19,9 @@
                     {
                         "name": "BGPBasedVIPManagement"
                     },
+                    {
+                        "name": "CapacityBufferAvailable"
+                    },
                     {
                         "name": "ClientsAllowCBOR"
                     },