diff --git a/features.md b/features.md
index 9e9ee037228..15f1c76b3a5 100644
--- a/features.md
+++ b/features.md
@@ -124,5 +124,4 @@
| UpgradeStatus| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| VSphereHostVMGroupZonal| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled |
| VSphereMixedNodeEnv| 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 |
diff --git a/features/features.go b/features/features.go
index d637ad6079c..eccebd2ea6e 100644
--- a/features/features.go
+++ b/features/features.go
@@ -170,13 +170,6 @@ var (
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()
- FeatureGateVSphereMultiDisk = newFeatureGate("VSphereMultiDisk").
- reportProblemsToJiraComponent("splat").
- contactPerson("vr4manta").
- productScope(ocpSpecific).
- enhancementPR("https://github.com/openshift/enhancements/pull/1709").
- enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
- mustRegister()
FeatureGateRouteExternalCertificate = newFeatureGate("RouteExternalCertificate").
reportProblemsToJiraComponent("router").
diff --git a/machine/v1beta1/types_vsphereprovider.go b/machine/v1beta1/types_vsphereprovider.go
index fe6626f7290..6ffe1e829d8 100644
--- a/machine/v1beta1/types_vsphereprovider.go
+++ b/machine/v1beta1/types_vsphereprovider.go
@@ -73,7 +73,6 @@ type VSphereMachineProviderSpec struct {
// dataDisks is a list of non OS disks to be created and attached to the VM. The max number of disk allowed to be attached is
// currently 29. The max number of disks for any controller is 30, but VM template will always have OS disk so that will leave
// 29 disks on any controller type.
- // +openshift:enable:FeatureGate=VSphereMultiDisk
// +optional
// +listType=map
// +listMapKey=name
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index 835fb695be5..af43c30fda7 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -388,9 +388,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
}
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
index a34b3ddcaf8..78ec55632ca 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -384,9 +384,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index ae194bc9c68..78b659ab257 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -390,9 +390,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
}
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
index 714beaafcfe..c160fb88548 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -384,9 +384,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
index d35e81aea95..ffe25136b48 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
@@ -388,9 +388,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
}
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
index edb98b4aa40..9db45196909 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -384,9 +384,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index d5032cbdfa2..db77e887c5c 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -390,9 +390,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
}
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
index 32950025582..001552d8f40 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -384,9 +384,6 @@
{
"name": "VSphereMixedNodeEnv"
},
- {
- "name": "VSphereMultiDisk"
- },
{
"name": "VSphereMultiNetworks"
},