diff --git a/features.md b/features.md
index dc792f76baf..5abca789365 100644
--- a/features.md
+++ b/features.md
@@ -59,7 +59,6 @@
 | MixedCPUsAllocation| | | <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>  |
 | MultiDiskSetup| | | <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>  |
 | MutatingAdmissionPolicy| | | <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>  |
-| NodeSwap| | | <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>  |
 | NutanixMultiSubnets| | | <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>  |
 | OVNObservability| | | <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>  |
 | PreconfiguredUDNAddresses| | | <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 34f4f0a706e..46d7179404d 100644
--- a/features/features.go
+++ b/features/features.go
@@ -92,15 +92,6 @@ var (
 					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	// OpenShift and Node Team will keep this turned off until evictions and
-	// disk provisioning are fixed even though upstream will take this GA.
-	FeatureGateNodeSwap = newFeatureGate("NodeSwap").
-				reportProblemsToJiraComponent("node").
-				contactPerson("haircommander").
-				productScope(kubernetes).
-				enhancementPR("https://github.com/kubernetes/enhancements/issues/2400").
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
 
 	FeatureGateDynamicResourceAllocation = newFeatureGate("DynamicResourceAllocation").
 						reportProblemsToJiraComponent("scheduling").
diff --git a/payload-command/render/renderassets/rendered_manifests_test.go b/payload-command/render/renderassets/rendered_manifests_test.go
index 3ca8b68f7cd..834f82c50ea 100644
--- a/payload-command/render/renderassets/rendered_manifests_test.go
+++ b/payload-command/render/renderassets/rendered_manifests_test.go
@@ -104,7 +104,6 @@ status:
     - name: MachineConfigNodes
     - name: MaxUnavailableStatefulSet
     - name: MetricsServer
-    - name: NodeSwap
     - name: RouteExternalCertificate
     - name: SigstoreImageVerification
     - name: ValidatingAdmissionPolicy
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index c6026cda089..0b322549491 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -184,9 +184,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index f0f524e0b6c..8245bfc8e3a 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -257,9 +257,6 @@
                     {
                         "name": "NetworkSegmentation"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 2d81b0f2d9d..fad56abd0aa 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -260,9 +260,6 @@
                     {
                         "name": "NetworkSegmentation"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 61081d796ae..db9eb4b4e8e 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -184,9 +184,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index d1fe1831c1c..004214a1272 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -257,9 +257,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index cf578a66b9b..eca53a933f8 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -260,9 +260,6 @@
                     {
                         "name": "NoRegistryClusterOperations"
                     },
-                    {
-                        "name": "NodeSwap"
-                    },
                     {
                         "name": "NutanixMultiSubnets"
                     },