diff --git a/roles/builder/templates/domain.xml.j2 b/roles/builder/templates/domain.xml.j2
index ede8d0e..b9d696c 100644
--- a/roles/builder/templates/domain.xml.j2
+++ b/roles/builder/templates/domain.xml.j2
@@ -3,7 +3,9 @@
   <memory unit='MB'>{{item.0.memory}}</memory>
   <vcpu placement='static'>{{item.0.cpu}}</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
+    <loader readonly="yes" secure="no" type="pflash">/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd</loader>
+    <nvram template='/usr/share/edk2/ovmf/OVMF_VARS.fd'/>
     <bios useserial='yes' rebootTimeout='0'/>
     <smbios mode='emulate'/>
   </os>
@@ -82,7 +84,7 @@
       <master startport='4'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
     </controller>
-    <controller type='pci' index='0' model='pci-root'>
+    <controller type='pci' index='0' model='pcie-root'>
       <alias name='pci.0'/>
     </controller>
     <controller type='virtio-serial' index='0'>
diff --git a/roles/builder/templates/scripts/lab-destroy.j2 b/roles/builder/templates/scripts/lab-destroy.j2
index 2d5b71a..b298318 100644
--- a/roles/builder/templates/scripts/lab-destroy.j2
+++ b/roles/builder/templates/scripts/lab-destroy.j2
@@ -6,7 +6,7 @@ do_destroy() {
   for i in $($VIRSH list --all --name | grep {{vm_prefix}}); do
     vbmc show -q $i &> /dev/null && vbmc -q --log-file /home/{{ virt_user }}/vbmc.log --no-daemon delete $i
     $VIRSH destroy $i;
-    $VIRSH undefine $i;
+    $VIRSH undefine $i --nvram --snapshots-metadata --checkpoints-metadata;
     rm -f /home/{{virt_user}}/workload/${i}*
   done
 {% if ansible_facts['distribution_version'] is version('8.0', 'gt', strict=False) %}
diff --git a/roles/overcloud/templates/baremetal.json.j2 b/roles/overcloud/templates/baremetal.json.j2
index aab0c1e..df5a161 100644
--- a/roles/overcloud/templates/baremetal.json.j2
+++ b/roles/overcloud/templates/baremetal.json.j2
@@ -28,7 +28,7 @@
       "pm_password": "ADMIN",
       "pm_addr": "192.168.122.1",
       "pm_port": "{{ '%s-%s-oc-%s'|format(vm_prefix, node.1, node.0.name)|hashed_port }}",
-      "capabilities": "node:{{ node.1 }}-{{node.0.name}},boot_option:local,boot_mode:bios"
+      "capabilities": "node:{{ node.1 }}-{{node.0.name}},boot_option:local"
     }{% if not loop.last %},
 {% endif %}
 {% set count.index = count.index+1 %}