diff --git a/multi-node-aio/playbooks/kvm/kvm-vm.xml.j2 b/multi-node-aio/playbooks/kvm/kvm-vm.xml.j2
index 0fd044f5..722ffeba 100644
--- a/multi-node-aio/playbooks/kvm/kvm-vm.xml.j2
+++ b/multi-node-aio/playbooks/kvm/kvm-vm.xml.j2
@@ -40,16 +40,20 @@
       <source dev='/dev/{{ default_vm_disk_vg }}/{{ hostvars[item]["server_hostname"] }}'/>
 {% elif default_vm_disk_mode == "file" %}
     <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='none' io='native'/>
+      <driver name='qemu' type='qcow2' discard='unmap' cache='none' io='native'/>
       <source file='{{ _virt_pools.pools.default.path | default('/data/images') }}/{{ hostvars[item]["server_hostname"] }}.img'/>
 {% endif %}
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
+      <target dev='sda' bus='scsi'/>
+      <alias name='scsi0-0-0-0'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
       <boot order='1'/>
     </disk>
     <controller type='pci' index='0' model='pci-root'>
       <alias name='pci.0'/>
     </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </controller>
     <controller type='virtio-serial' index='0'>
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
diff --git a/multi-node-aio/playbooks/pxe/configs/debian/compute.config.j2 b/multi-node-aio/playbooks/pxe/configs/debian/compute.config.j2
index da73d941..aad6b3ba 100644
--- a/multi-node-aio/playbooks/pxe/configs/debian/compute.config.j2
+++ b/multi-node-aio/playbooks/pxe/configs/debian/compute.config.j2
@@ -30,7 +30,7 @@ d-i netcfg/wireless_wep string
 
 # Pre Install
 
-# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/vda. See Ubuntu bug #1347726.
+# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/sda. See Ubuntu bug #1347726.
 d-i preseed/early_command string \
       umount /media || true
 
diff --git a/multi-node-aio/playbooks/pxe/configs/debian/infra.config.j2 b/multi-node-aio/playbooks/pxe/configs/debian/infra.config.j2
index 2cd1bc73..235291ff 100644
--- a/multi-node-aio/playbooks/pxe/configs/debian/infra.config.j2
+++ b/multi-node-aio/playbooks/pxe/configs/debian/infra.config.j2
@@ -30,7 +30,7 @@ d-i netcfg/wireless_wep string
 
 # Pre Install
 
-# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/vda. See Ubuntu bug #1347726.
+# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/sda. See Ubuntu bug #1347726.
 d-i preseed/early_command string \
       umount /media || true
 
diff --git a/multi-node-aio/playbooks/pxe/configs/debian/vm-compute.config.j2 b/multi-node-aio/playbooks/pxe/configs/debian/vm-compute.config.j2
index 021494c4..643d75de 100644
--- a/multi-node-aio/playbooks/pxe/configs/debian/vm-compute.config.j2
+++ b/multi-node-aio/playbooks/pxe/configs/debian/vm-compute.config.j2
@@ -30,7 +30,7 @@ d-i netcfg/wireless_wep string
 
 # Pre Install
 
-# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/vda. See Ubuntu bug #1347726.
+# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/sda. See Ubuntu bug #1347726.
 d-i preseed/early_command string \
       umount /media || true
 
@@ -90,7 +90,7 @@ d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
 d-i partman-auto/method string lvm
-d-i partman-auto/disk string /dev/vda
+d-i partman-auto/disk string /dev/sda
 
 # For LVM partitioning, you can select how much of the volume group to use
 # for logical volumes.
@@ -111,7 +111,7 @@ d-i partman-auto/expert_recipe string \
               1024 1 100% ext4                                \
                       $primary{ }                             \
                       method{ lvm }                           \
-                      device{ /dev/vda2 }                     \
+                      device{ /dev/sda2 }                     \
                       vg_name{ vmvg00 }                       \
               .                                               \
               2048 1 4096 linux-swap                          \
diff --git a/multi-node-aio/playbooks/pxe/configs/debian/vm.config.j2 b/multi-node-aio/playbooks/pxe/configs/debian/vm.config.j2
index fb25b1fd..78dd06e4 100644
--- a/multi-node-aio/playbooks/pxe/configs/debian/vm.config.j2
+++ b/multi-node-aio/playbooks/pxe/configs/debian/vm.config.j2
@@ -30,7 +30,7 @@ d-i netcfg/wireless_wep string
 
 # Pre Install
 
-# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/vda. See Ubuntu bug #1347726.
+# Command Line 1: This is necessary otherwise you will be prompted to umount /dev/sda. See Ubuntu bug #1347726.
 d-i preseed/early_command string \
       umount /media || true
 
@@ -90,7 +90,7 @@ d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
 d-i partman-auto/method string lvm
-d-i partman-auto/disk string /dev/vda
+d-i partman-auto/disk string /dev/sda
 
 # For LVM partitioning, you can select how much of the volume group to use
 # for logical volumes.
@@ -111,7 +111,7 @@ d-i partman-auto/expert_recipe string \
               1024 1 100% ext4                                \
                       $primary{ }                             \
                       method{ lvm }                           \
-                      device{ /dev/vda2 }                     \
+                      device{ /dev/sda2 }                     \
                       vg_name{ vmvg00 }                       \
               .                                               \
               2048 1 4096 linux-swap                          \
diff --git a/multi-node-aio/playbooks/pxe/configs/redhat/vm-compute.config.j2 b/multi-node-aio/playbooks/pxe/configs/redhat/vm-compute.config.j2
index 5ef267bc..fb0c6aa5 100644
--- a/multi-node-aio/playbooks/pxe/configs/redhat/vm-compute.config.j2
+++ b/multi-node-aio/playbooks/pxe/configs/redhat/vm-compute.config.j2
@@ -9,7 +9,7 @@ selinux --disabled
 firewall --disabled
 services --enabled=NetworkManager,sshd
 eula --agreed
-ignoredisk --only-use=vda
+ignoredisk --only-use=sda
 reboot
 
 bootloader --location=mbr
diff --git a/multi-node-aio/playbooks/pxe/configs/redhat/vm.config.j2 b/multi-node-aio/playbooks/pxe/configs/redhat/vm.config.j2
index a701fdc7..af333d18 100644
--- a/multi-node-aio/playbooks/pxe/configs/redhat/vm.config.j2
+++ b/multi-node-aio/playbooks/pxe/configs/redhat/vm.config.j2
@@ -9,7 +9,7 @@ selinux --disabled
 firewall --disabled
 services --enabled=NetworkManager,sshd
 eula --agreed
-ignoredisk --only-use=vda
+ignoredisk --only-use=sda
 reboot
 
 bootloader --location=mbr