diff --git a/deployment/libvirt/compute.xml b/deployment/libvirt/compute.xml
index 19e052ad6..d1f929137 100644
--- a/deployment/libvirt/compute.xml
+++ b/deployment/libvirt/compute.xml
@@ -7,17 +7,17 @@
     <partition>/machine</partition>
   </resource>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-xenial'>hvm</type>
   </os>
   <features>
     <acpi/>
     <apic/>
     <pae/>
   </features>
-  <cpu mode='host-model'>
-    <model fallback='allow'/>
+  <cpu match='exact'>
+    <model fallback='forbid'>Nehalem</model>
     <topology sockets='1' cores='4' threads='1'/>
-    <feature policy='optional' name='vmx'/>
+    <feature policy='require' name='vmx'/>
     <feature policy='optional' name='svm'/>
   </cpu>
   <clock offset='utc'/>
diff --git a/deployment/libvirt/controller.xml b/deployment/libvirt/controller.xml
index ed54d36df..bf056d32c 100644
--- a/deployment/libvirt/controller.xml
+++ b/deployment/libvirt/controller.xml
@@ -7,15 +7,15 @@
     <partition>/machine</partition>
   </resource>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-xenial'>hvm</type>
   </os>
   <features>
     <acpi/>
     <apic/>
     <pae/>
   </features>
-  <cpu mode='host-model'>
-    <model fallback='allow'/>
+  <cpu match='exact'>
+    <model fallback='forbid'>Nehalem</model>
     <topology sockets='1' cores='4' threads='1'/>
     <feature policy='optional' name='vmx'/>
     <feature policy='optional' name='svm'/>