diff --git a/schema/azure/defaults/infrastructure/virtual-machine.yml b/schema/azure/defaults/infrastructure/virtual-machine.yml
index 96cc966b16..2adb93fc8c 100644
--- a/schema/azure/defaults/infrastructure/virtual-machine.yml
+++ b/schema/azure/defaults/infrastructure/virtual-machine.yml
@@ -30,10 +30,7 @@ specification:
     managed_disk_type: Premium_LRS
   additional_disks: []
     # - storage_account_type: Premium_LRS
-    #   create_option: Empty
     #   disk_size_gb: 32
-    #   device_name: "/dev/sdb"
-    #   mountpoint: /var/pvs
   network_interface:
     enable_accelerated_networking: false
     private_ip:
diff --git a/terraform/azure/infrastructure/virtual-machine.j2 b/terraform/azure/infrastructure/virtual-machine.j2
index 108ea5234b..b79be97114 100644
--- a/terraform/azure/infrastructure/virtual-machine.j2
+++ b/terraform/azure/infrastructure/virtual-machine.j2
@@ -82,8 +82,6 @@ resource "azurerm_virtual_machine" "{{ specification.name }}" {
   depends_on = [azurerm_network_interface_security_group_association.{{ specification.security_group_association_name }}]
   {%- endif %}
 
-  #TODO:
-  # storage_data_disk
 }
 
 {%- if specification.additional_disks is defined %}
@@ -93,7 +91,7 @@ resource "azurerm_managed_disk" "{{ specification.name }}-data-disk-{{ loop.inde
   location             = azurerm_resource_group.rg.location
   resource_group_name  = azurerm_resource_group.rg.name
   storage_account_type = "{{ disk.storage_account_type }}"
-  create_option        = "{{ disk.create_option }}"
+  create_option        = "Empty"
   disk_size_gb         = "{{ disk.disk_size_gb }}"
 }
 
@@ -103,6 +101,5 @@ resource "azurerm_virtual_machine_data_disk_attachment" "{{ specification.name }
   lun                = "{{ loop.index * 10 }}"
   caching            = "ReadWrite"
 }
-
   {%- endfor %}
 {%- endif %}