diff --git a/features.md b/features.md
index afa64782571..a2985b8ed92 100644
--- a/features.md
+++ b/features.md
@@ -118,4 +118,3 @@
| UserNamespacesSupport| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| VSphereMultiDisk| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| VSphereMultiNetworks| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
-| VolumeAttributesClass| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 187edb0e164..e1464a104d6 100644
--- a/features/features.go
+++ b/features/features.go
@@ -409,14 +409,6 @@ var (
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default, configv1.OKD).
mustRegister()
- FeatureGateVolumeAttributesClass = newFeatureGate("VolumeAttributesClass").
- reportProblemsToJiraComponent("Storage / Kubernetes External Components").
- contactPerson("dfajmon").
- productScope(kubernetes).
- enhancementPR("https://github.com/kubernetes/enhancements/issues/3751").
- enableIn(configv1.Default, configv1.OKD, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
- mustRegister()
-
FeatureGateVolumeGroupSnapshot = newFeatureGate("VolumeGroupSnapshot").
reportProblemsToJiraComponent("Storage / Kubernetes External Components").
contactPerson("fbertina").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
index 326d875acd8..eb935cd6016 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -367,9 +367,6 @@
},
{
"name": "VSphereMultiNetworks"
- },
- {
- "name": "VolumeAttributesClass"
}
],
"version": ""
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
index 1897be7b3c5..7136e1d45fc 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -367,9 +367,6 @@
{
"name": "VSphereMultiNetworks"
},
- {
- "name": "VolumeAttributesClass"
- },
{
"name": "VolumeGroupSnapshot"
}
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
index 91f2cd1e720..3851d715d9e 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-OKD.yaml
@@ -369,9 +369,6 @@
},
{
"name": "VSphereMultiNetworks"
- },
- {
- "name": "VolumeAttributesClass"
}
],
"version": ""
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
index 5853607c02b..8b27846a959 100644
--- a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -367,9 +367,6 @@
{
"name": "VSphereMultiNetworks"
},
- {
- "name": "VolumeAttributesClass"
- },
{
"name": "VolumeGroupSnapshot"
}
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
index 43c5affe7e2..a5462634511 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
@@ -367,9 +367,6 @@
},
{
"name": "VSphereMultiNetworks"
- },
- {
- "name": "VolumeAttributesClass"
}
],
"version": ""
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
index e9d704c6a35..74e45362acb 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -367,9 +367,6 @@
{
"name": "VSphereMultiNetworks"
},
- {
- "name": "VolumeAttributesClass"
- },
{
"name": "VolumeGroupSnapshot"
}
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
index 9c72a8df94f..8a1482b0004 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-OKD.yaml
@@ -369,9 +369,6 @@
},
{
"name": "VSphereMultiNetworks"
- },
- {
- "name": "VolumeAttributesClass"
}
],
"version": ""
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
index f3a7e2c225a..bd36725aca3 100644
--- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -367,9 +367,6 @@
{
"name": "VSphereMultiNetworks"
},
- {
- "name": "VolumeAttributesClass"
- },
{
"name": "VolumeGroupSnapshot"
}