diff --git a/features.md b/features.md
index 7b6daee437e..a4dc18c8036 100644
--- a/features.md
+++ b/features.md
@@ -5,6 +5,7 @@
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | ShortCertRotation| | | | | |  |
+| CSIVolumeHealth| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | DualReplica| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
@@ -74,6 +75,7 @@
 | 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>  |
 | HardwareSpeed| <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>  |
+| HonorPVReclaimPolicy| <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>  |
 | IngressControllerLBSubnetsAWS| <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>  |
 | KMSv1| <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>  |
 | ManagedBootImages| <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>  |
@@ -91,6 +93,7 @@
 | PrivateHostedZoneAWS| <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>  |
 | ProcMountType| <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>  |
 | RouteExternalCertificate| <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>  |
+| SELinuxMountReadWriteOncePod| <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>  |
 | ServiceAccountTokenNodeBinding| <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>  |
 | SetEIPForNLBIngressController| <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>  |
 | UserNamespacesPodSecurityStandards| <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 a42296e54c5..8c4d61f3d05 100644
--- a/features/features.go
+++ b/features/features.go
@@ -814,4 +814,28 @@ var (
 					enhancementPR("https://github.com/openshift/enhancements/pull/1781").
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
+
+	FeatureGateSELinuxMountReadWriteOncePod = newFeatureGate("SELinuxMountReadWriteOncePod").
+						reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+						contactPerson("jsafrane").
+						productScope(kubernetes).
+						enhancementPR("https://github.com/kubernetes/enhancements/issues/1710").
+						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+						mustRegister()
+
+	FeatureGateHonorPVReclaimPolicy = newFeatureGate("HonorPVReclaimPolicy").
+					reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+					contactPerson("jsafrane").
+					productScope(kubernetes).
+					enhancementPR("https://github.com/kubernetes/enhancements/issues/2644").
+					enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					mustRegister()
+
+	FeatureGateCSIVolumeHealth = newFeatureGate("CSIVolumeHealth").
+					reportProblemsToJiraComponent("Storage / Kubernetes External Components").
+					contactPerson("jsafrane").
+					productScope(kubernetes).
+					enhancementPR("https://github.com/kubernetes/enhancements/issues/1432").
+					enableIn(configv1.DevPreviewNoUpgrade).
+					mustRegister()
 )
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 672e9722383..b83bc8f78a1 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -28,6 +28,9 @@
                     {
                         "name": "BootcNodeManagement"
                     },
+                    {
+                        "name": "CSIVolumeHealth"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -237,6 +240,9 @@
                     {
                         "name": "HardwareSpeed"
                     },
+                    {
+                        "name": "HonorPVReclaimPolicy"
+                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },
@@ -288,6 +294,9 @@
                     {
                         "name": "RouteExternalCertificate"
                     },
+                    {
+                        "name": "SELinuxMountReadWriteOncePod"
+                    },
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index fbf8628faaf..3e211e3e745 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -80,6 +80,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "CSIVolumeHealth"
+                    },
                     {
                         "name": "ChunkSizeMiB"
                     },
@@ -143,6 +146,9 @@
                     {
                         "name": "HighlyAvailableArbiter"
                     },
+                    {
+                        "name": "HonorPVReclaimPolicy"
+                    },
                     {
                         "name": "ImageStreamImportMode"
                     },
@@ -257,6 +263,9 @@
                     {
                         "name": "SELinuxMount"
                     },
+                    {
+                        "name": "SELinuxMountReadWriteOncePod"
+                    },
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index abcfb0cad4b..3dbd935a55d 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -15,6 +15,9 @@
         "featureGates": [
             {
                 "disabled": [
+                    {
+                        "name": "CSIVolumeHealth"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -152,6 +155,9 @@
                     {
                         "name": "HighlyAvailableArbiter"
                     },
+                    {
+                        "name": "HonorPVReclaimPolicy"
+                    },
                     {
                         "name": "ImageStreamImportMode"
                     },
@@ -260,6 +266,9 @@
                     {
                         "name": "RouteExternalCertificate"
                     },
+                    {
+                        "name": "SELinuxMountReadWriteOncePod"
+                    },
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 90722a98d44..f6ae9eb306d 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -28,6 +28,9 @@
                     {
                         "name": "BootcNodeManagement"
                     },
+                    {
+                        "name": "CSIVolumeHealth"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -234,6 +237,9 @@
                     {
                         "name": "HardwareSpeed"
                     },
+                    {
+                        "name": "HonorPVReclaimPolicy"
+                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },
@@ -288,6 +294,9 @@
                     {
                         "name": "RouteExternalCertificate"
                     },
+                    {
+                        "name": "SELinuxMountReadWriteOncePod"
+                    },
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 9854944a412..d7e855940e5 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -68,6 +68,9 @@
                     {
                         "name": "CPMSMachineNamePrefix"
                     },
+                    {
+                        "name": "CSIVolumeHealth"
+                    },
                     {
                         "name": "ChunkSizeMiB"
                     },
@@ -131,6 +134,9 @@
                     {
                         "name": "HighlyAvailableArbiter"
                     },
+                    {
+                        "name": "HonorPVReclaimPolicy"
+                    },
                     {
                         "name": "ImageStreamImportMode"
                     },
@@ -257,6 +263,9 @@
                     {
                         "name": "SELinuxMount"
                     },
+                    {
+                        "name": "SELinuxMountReadWriteOncePod"
+                    },
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index f72844ab405..63d0cb68de6 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -15,6 +15,9 @@
         "featureGates": [
             {
                 "disabled": [
+                    {
+                        "name": "CSIVolumeHealth"
+                    },
                     {
                         "name": "ClusterAPIInstall"
                     },
@@ -140,6 +143,9 @@
                     {
                         "name": "HighlyAvailableArbiter"
                     },
+                    {
+                        "name": "HonorPVReclaimPolicy"
+                    },
                     {
                         "name": "ImageStreamImportMode"
                     },
@@ -260,6 +266,9 @@
                     {
                         "name": "RouteExternalCertificate"
                     },
+                    {
+                        "name": "SELinuxMountReadWriteOncePod"
+                    },
                     {
                         "name": "ServiceAccountTokenNodeBinding"
                     },