diff --git a/azure/cpi-secondary.yml b/azure/cpi-secondary.yml
index a64c953b..5306e540 100644
--- a/azure/cpi-secondary.yml
+++ b/azure/cpi-secondary.yml
@@ -21,6 +21,6 @@
     resource_group_name: unused
     ssh_public_key: unused
     ssh_user: unused
-    storage_account_name: unused
     subscription_id: unused
     tenant_id: unused
+    use_managed_disks: true
diff --git a/azure/cpi.yml b/azure/cpi.yml
index bec19fb7..b4fdce31 100644
--- a/azure/cpi.yml
+++ b/azure/cpi.yml
@@ -44,9 +44,9 @@
     resource_group_name: ((resource_group_name))
     ssh_public_key: ((ssh.public_key))
     ssh_user: vcap
-    storage_account_name: ((storage_account_name))
     subscription_id: ((subscription_id))
     tenant_id: ((tenant_id))
+    use_managed_disks: true
 - path: /cloud_provider/properties/azure?
   type: replace
   value:
@@ -57,9 +57,9 @@
     resource_group_name: ((resource_group_name))
     ssh_public_key: ((ssh.public_key))
     ssh_user: vcap
-    storage_account_name: ((storage_account_name))
     subscription_id: ((subscription_id))
     tenant_id: ((tenant_id))
+    use_managed_disks: true
 - path: /variables/-
   type: replace
   value:
diff --git a/azure/use-managed-disks.yml b/azure/use-managed-disks.yml
index f201dc6b..bb9d48ae 100644
--- a/azure/use-managed-disks.yml
+++ b/azure/use-managed-disks.yml
@@ -1,14 +1,3 @@
+# Managed disks are now enabled by default in azure/cpi.yml.
+# Keeping this ops-file for backwards compatibility.
 ---
-- type: replace
-  path: /instance_groups/name=bosh/properties/azure/use_managed_disks?
-  value: true
-
-- type: remove
-  path: /instance_groups/name=bosh/properties/azure/storage_account_name
-
-- type: replace
-  path: /cloud_provider/properties/azure/use_managed_disks?
-  value: true
-
-- type: remove
-  path: /cloud_provider/properties/azure/storage_account_name
diff --git a/tests/run-checks.sh b/tests/run-checks.sh
index 9a84bf9d..89e72b6e 100755
--- a/tests/run-checks.sh
+++ b/tests/run-checks.sh
@@ -444,7 +444,6 @@ bosh create-env bosh.yml \
   -v client_id=test \
   -v client_secret=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (custom-environment)"
@@ -465,7 +464,6 @@ bosh create-env bosh.yml \
   -v client_id=test \
   -v client_secret=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (managed-identity)"
@@ -483,7 +481,6 @@ bosh create-env bosh.yml \
   -v subscription_id=test \
   -v azure-managed-identity=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (managed-identity-for-bosh-managed-vms)"
@@ -502,7 +499,6 @@ bosh create-env bosh.yml \
   -v subscription_id=test \
   -v azure-managed-identity=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (cloud-config)"