diff --git a/core-modules/000QubesVm.py b/core-modules/000QubesVm.py
index 6ce6a7b5..8660abcb 100644
--- a/core-modules/000QubesVm.py
+++ b/core-modules/000QubesVm.py
@@ -996,7 +996,7 @@ class QubesVm(object):
                    "      <mac address='{mac}'/>\n" \
                    "      <ip address='{ip}'/>\n" \
                    "      <script path='vif-route-qubes'/>\n" \
-                   "      <domain name='{backend}'/>\n" \
+                   "      <source domain='{backend}'/>\n" \
                    "    </interface>\n"
         return template.format(ip=ip, mac=mac, backend=backend)
 
diff --git a/vm-config/xen-vm-template-hvm.xml b/vm-config/xen-vm-template-hvm.xml
index d149ea57..32866535 100644
--- a/vm-config/xen-vm-template-hvm.xml
+++ b/vm-config/xen-vm-template-hvm.xml
@@ -22,7 +22,7 @@
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>stubdom-dm</emulator>
+    <emulator type='stubdom'/>
 {rootdev}
 {privatedev}
 {otherdevs}