diff --git a/debian/control b/debian/control
index 11a751b..9d3540e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Rules-Requires-Root: no
 
 Package: libvirt-dist
 Architecture: all
-Depends: adduser, qemu-kvm, libvirt-daemon-system, libvirt-clients,
- virt-manager, gir1.2-spiceclientgtk-3.0, dnsmasq-base, helper-scripts,
+Depends: adduser, qemu-kvm, libvirt-daemon, libvirt-clients,
+ virt-manager, gir1.2-spiceclientgtk-3.0, passt, helper-scripts,
  msgcollector, ${misc:Depends}
 Provides: whonix-libvirt
 Replaces: whonix-libvirt
diff --git a/usr/libexec/libvirt-dist/install b/usr/libexec/libvirt-dist/install
index 23f9345..65507a9 100755
--- a/usr/libexec/libvirt-dist/install
+++ b/usr/libexec/libvirt-dist/install
@@ -32,14 +32,14 @@ chmod 777 /mnt/workstation-shared
 
 ## TODO: proper error handling. '|| true' can probably be removed.
 
-virsh -c qemu:///system net-autostart "default" || true
-virsh -c qemu:///system net-start "default" || true
-virsh -c qemu:///system net-define "/usr/share/libvirt-dist/xml/Whonix-External.xml" || true
-virsh -c qemu:///system net-define "/usr/share/libvirt-dist/xml/Whonix-Internal.xml" || true
-virsh -c qemu:///system net-autostart "Whonix-External" || true
-virsh -c qemu:///system net-start "Whonix-External" || true
-virsh -c qemu:///system net-autostart "Whonix-Internal" || true
-virsh -c qemu:///system net-start "Whonix-Internal" || true
+virsh -c qemu:///session net-autostart "default" || true
+virsh -c qemu:///session net-start "default" || true
+virsh -c qemu:///session net-define "/usr/share/libvirt-dist/xml/Whonix-External.xml" || true
+virsh -c qemu:///session net-define "/usr/share/libvirt-dist/xml/Whonix-Internal.xml" || true
+virsh -c qemu:///session net-autostart "Whonix-External" || true
+virsh -c qemu:///session net-start "Whonix-External" || true
+virsh -c qemu:///session net-autostart "Whonix-Internal" || true
+virsh -c qemu:///session net-start "Whonix-Internal" || true
 
 ## Doing the following in a temporary directory to avoid modified files should
 ## this be interrupted in the middle.
@@ -80,8 +80,8 @@ fi
 test -f "$temp_dir/xml/Whonix-Gateway.xml"
 test -f "$temp_dir/xml/Whonix-Workstation.xml"
 
-virsh -c qemu:///system define "$temp_dir/xml/Whonix-Gateway.xml" || true
-virsh -c qemu:///system define "$temp_dir/xml/Whonix-Workstation.xml" || true
+virsh -c qemu:///session define "$temp_dir/xml/Whonix-Gateway.xml" || true
+virsh -c qemu:///session define "$temp_dir/xml/Whonix-Workstation.xml" || true
 
 virt-xml "Whonix-Gateway" --add-device --filesystem source=/mnt/gateway-shared,target=shared,type=mount,accessmode=mapped || true
 virt-xml "Whonix-Workstation" --add-device --filesystem source=/mnt/workstation-shared,target=shared,type=mount,accessmode=mapped || true
diff --git a/usr/share/libvirt-dist/ci_test b/usr/share/libvirt-dist/ci_test
index 923d084..951c0e2 100755
--- a/usr/share/libvirt-dist/ci_test
+++ b/usr/share/libvirt-dist/ci_test
@@ -3,9 +3,7 @@
 set -x
 set -e
 
-if printf '%s\n' "$PWD" | grep -- travis >/dev/null 2>/dev/null; then
-   true "travis detected, ok."
-elif [ ! "$CI" = "true" ]; then
+if [ ! "$CI" = "true" ]; then
    true "ERROR: You probably do not want to run this outside of a CI \
 environment, because it uses virsh to undefine virtual machines."
    exit 1
@@ -18,13 +16,13 @@ cd ..
 cd ..
 
 ## Debugging.
-cat /etc/apt/sources.list || true
-ls -la /etc/apt/sources.list.d/* || true
-cat /etc/apt/sources.list.d/* || true
-ls -la /etc/apt/apt.conf.d/ || true
-cat /etc/apt/apt.conf.d/* || true
-ls -la /etc/apt/preferences.d/ || true
-cat /etc/apt/preferences.d/* || true
+# cat /etc/apt/sources.list || true
+# ls -la /etc/apt/sources.list.d/* || true
+# cat /etc/apt/sources.list.d/* || true
+# ls -la /etc/apt/apt.conf.d/ || true
+# cat /etc/apt/apt.conf.d/* || true
+# ls -la /etc/apt/preferences.d/ || true
+# cat /etc/apt/preferences.d/* || true
 
 ## Version closer to Debian release.
 # sudo --non-interactive rm -f /etc/apt/sources.list || true
@@ -37,7 +35,7 @@ cat /etc/apt/preferences.d/* || true
 apt-get update
 
 ## Sanity tests.
-apt-get --yes dist-upgrade
+#apt-get --yes dist-upgrade
 dpkg --configure -a
 
 apt-get --yes install sudo virt-what lintian
@@ -47,12 +45,6 @@ apt-get install --no-install-recommends -y qemu-kvm libvirt-daemon-system libvir
 
 apt-get install --no-install-recommends -y kmod || true
 
-service libvirtd start || true
-service virtlockd start || true
-service virtlogd start || true
-service virtlockd-admin start || true
-service virtlogd-admin start || true
-
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
@@ -63,47 +55,10 @@ true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 
-#sudo --non-interactive chmod o+rwx /run/libvirt/libvirt-sock
-
-true "------------------------------------------------------------"
-true "------------------------------------------------------------"
-true "------------------------------------------------------------"
-
-test -f ./usr/share/libvirt-dist/xml/Whonix-External.xml
-
-## /usr/bin/virt-xml-validate: cannot determine schema type for ./usr/share/libvirt-dist/xml/Whonix-External.xml
-virt-xml-validate ./usr/share/libvirt-dist/xml/Whonix-External.xml || true
-
-virsh -c qemu:///system net-define ./usr/share/libvirt-dist/xml/Whonix-External.xml
-virsh -c qemu:///system net-autostart Whonix-External
-virsh -c qemu:///system net-start Whonix-External || true
-
-true "------------------------------------------------------------"
-true "------------------------------------------------------------"
-true "------------------------------------------------------------"
-
-test -f ./usr/share/libvirt-dist/xml/Whonix-Internal.xml
-
-virt-xml-validate ./usr/share/libvirt-dist/xml/Whonix-Internal.xml || true
-
-virsh -c qemu:///system net-define ./usr/share/libvirt-dist/xml/Whonix-Internal.xml
-virsh -c qemu:///system net-autostart Whonix-Internal
-virsh -c qemu:///system net-start Whonix-Internal || true
-
-true "------------------------------------------------------------"
-true "------------------------------------------------------------"
-true "------------------------------------------------------------"
-
 ## Debugging.
 
-virsh -c qemu:///system net-dumpxml default
-virsh -c qemu:///system net-dumpxml default --inactive
-
-virsh -c qemu:///system net-dumpxml Whonix-External
-virsh -c qemu:///system net-dumpxml Whonix-External --inactive
-
-virsh -c qemu:///system net-dumpxml Whonix-Internal
-virsh -c qemu:///system net-dumpxml Whonix-Internal --inactive
+virsh -c qemu:///session net-dumpxml default
+virsh -c qemu:///session net-dumpxml default --inactive
 
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
@@ -118,17 +73,15 @@ true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 
-## Travis CI issue:
 ## + virsh domxml-to-native qemu-argv ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml
 ## error: invalid argument: could not find capabilities for domaintype=kvm
-search="<domain type='kvm'>"
-replace="<domain type='qemu'>"
+search="<domain type='kvm'"
+replace="<domain type='qemu'"
 sed -i -e "s/$search/$replace/g" ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml
 sed -i -e "s/$search/$replace/g" ./usr/share/libvirt-dist/xml/Whonix-Workstation.xml
 sed -i -e "s/$search/$replace/g" ./usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml
 sed -i -e "s/$search/$replace/g" ./usr/share/libvirt-dist/xml/Kicksecure.xml
 
-## Travis CI issue:
 ## + virsh domxml-to-native qemu-argv ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml
 ## error: unsupported configuration: CPU mode 'host-passthrough' for x86_64 qemu domain on x86_64 host is not supported by hypervisor
 search="<cpu mode='host-passthrough'/>"
@@ -138,7 +91,6 @@ sed -i -e "s#$search#$replace#g" ./usr/share/libvirt-dist/xml/Whonix-Workstation
 sed -i -e "s#$search#$replace#g" ./usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml
 sed -i -e "s#$search#$replace#g" ./usr/share/libvirt-dist/xml/Kicksecure.xml
 
-## Travis CI issue:
 ## + virsh domxml-to-native qemu-argv ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml
 ## error: Unable to open /dev/net/tun, is tun module loaded?: No such file or directory
 modprobe tun || true
@@ -147,7 +99,6 @@ true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 
-## TODO: virt-xml-validate does not work in Travis CI.
 ## /usr/bin/virt-xml-validate: cannot determine schema type for ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml
 virt-xml-validate ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml || true
 virt-xml-validate ./usr/share/libvirt-dist/xml/Whonix-Workstation.xml || true
@@ -173,17 +124,17 @@ true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
 
-virsh -c qemu:///system define ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml
-virsh -c qemu:///system undefine Whonix-Gateway
+virsh -c qemu:///session define ./usr/share/libvirt-dist/xml/Whonix-Gateway.xml
+virsh -c qemu:///session undefine Whonix-Gateway
 
-virsh -c qemu:///system define ./usr/share/libvirt-dist/xml/Whonix-Workstation.xml
-virsh -c qemu:///system undefine Whonix-Workstation
+virsh -c qemu:///session define ./usr/share/libvirt-dist/xml/Whonix-Workstation.xml
+virsh -c qemu:///session undefine Whonix-Workstation
 
-virsh -c qemu:///system define ./usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml
-virsh -c qemu:///system undefine Whonix-Custom-Workstation
+virsh -c qemu:///session define ./usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml
+virsh -c qemu:///session undefine Whonix-Custom-Workstation
 
-virsh -c qemu:///system define ./usr/share/libvirt-dist/xml/Kicksecure.xml
-virsh -c qemu:///system undefine Kicksecure
+virsh -c qemu:///session define ./usr/share/libvirt-dist/xml/Kicksecure.xml
+virsh -c qemu:///session undefine Kicksecure
 
 true "------------------------------------------------------------"
 true "------------------------------------------------------------"
diff --git a/usr/share/libvirt-dist/xml/Kicksecure.xml b/usr/share/libvirt-dist/xml/Kicksecure.xml
index c082f53..fa46b61 100644
--- a/usr/share/libvirt-dist/xml/Kicksecure.xml
+++ b/usr/share/libvirt-dist/xml/Kicksecure.xml
@@ -12,10 +12,6 @@
     <nosharepages/>
   </memoryBacking>
 
-  <blkiotune>
-    <weight>250</weight>
-  </blkiotune>
-
   <vcpu placement='static' cpuset='1'>1</vcpu>
   <cpu mode='host-passthrough'/>
 
@@ -51,16 +47,15 @@
   </pm>
 
   <devices>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/Kicksecure.qcow2'/>
-      <target dev='vda' bus='virtio'/>
+    <disk type="volume" device="disk">
+      <driver name="qemu" type="qcow2"/>
+      <source pool="default" volume="Kicksecure.qcow2"/>
+      <target dev="vda" bus="virtio"/>
     </disk>
 
-    <interface type='network'>
-      <source network='default'/>
+    <interface type='user'>
+      <backend type='passt'/>
       <model type='virtio'/>
-      <driver name='qemu'/>
     </interface>
 
     <controller type='virtio-serial' index='0'/>
diff --git a/usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml b/usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml
index a78f5ab..3c13dae 100644
--- a/usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml
+++ b/usr/share/libvirt-dist/xml/Whonix-Custom-Workstation.xml
@@ -12,10 +12,6 @@
     <nosharepages/>
   </memoryBacking>
 
-  <blkiotune>
-    <weight>250</weight>
-  </blkiotune>
-
   <vcpu placement='static' cpuset='1'>1</vcpu>
   <cpu mode='host-passthrough'/>
 
@@ -51,16 +47,17 @@
   </pm>
 
   <devices>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/Whonix-Custom-Workstation.qcow2'/>
-      <target dev='vda' bus='virtio'/>
+    <disk type="volume" device="disk">
+      <driver name="qemu" type="qcow2"/>
+      <source pool="default" volume="Whonix-Custom-Workstation.qcow2"/>
+      <target dev="vda" bus="virtio"/>
     </disk>
 
-    <interface type='network'>
-      <source network='Whonix-Internal'/>
-      <model type='virtio'/>
-      <driver name='qemu'/>
+    <interface type='udp'>
+      <source address='127.0.0.1' port='6688'>
+        <local address='127.0.0.1' port='5577'/>
+      </source>
+      <model type="virtio"/>
     </interface>
 
     <controller type='virtio-serial' index='0'/>
@@ -104,4 +101,5 @@
       <backend model='random'>/dev/random</backend>
     </rng>
   </devices>
+
 </domain>
diff --git a/usr/share/libvirt-dist/xml/Whonix-External.xml b/usr/share/libvirt-dist/xml/Whonix-External.xml
deleted file mode 100644
index 1ae426f..0000000
--- a/usr/share/libvirt-dist/xml/Whonix-External.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<network>
-  <name>Whonix-External</name>
-  <forward mode='nat'>
-    <nat ipv6='yes'/>
-  </forward>
-  <bridge name='virbr1' stp='on' delay='0'/>
-  <dns enable="no"/>
-  <ip address='10.0.2.2' netmask='255.255.255.0'/>
-  <ip family="ipv6" address="fd19:c33d:98bc::" prefix="64"/>
-</network>
diff --git a/usr/share/libvirt-dist/xml/Whonix-Gateway.xml b/usr/share/libvirt-dist/xml/Whonix-Gateway.xml
index 77efcdd..9d0e69f 100644
--- a/usr/share/libvirt-dist/xml/Whonix-Gateway.xml
+++ b/usr/share/libvirt-dist/xml/Whonix-Gateway.xml
@@ -12,10 +12,6 @@
     <nosharepages/>
   </memoryBacking>
 
-  <blkiotune>
-    <weight>250</weight>
-  </blkiotune>
-
   <vcpu placement='static' cpuset='0'>1</vcpu>
   <cpu mode='host-passthrough'/>
 
@@ -51,22 +47,22 @@
   </pm>
 
   <devices>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/Whonix-Gateway.qcow2'/>
-      <target dev='vda' bus='virtio'/>
+    <disk type="volume" device="disk">
+      <driver name="qemu" type="qcow2"/>
+      <source pool="default" volume="Whonix-Gateway.qcow2"/>
+      <target dev="vda" bus="virtio"/>
     </disk>
 
-    <interface type='network'>
-      <source network='Whonix-External'/>
+    <interface type='user'>
+      <backend type='passt'/>
       <model type='virtio'/>
-      <driver name='qemu'/>
     </interface>
 
-    <interface type='network'>
-      <source network='Whonix-Internal'/>
-      <model type='virtio'/>
-      <driver name='qemu'/>
+    <interface type="udp">
+      <source address="127.0.0.1" port="5577">
+        <local address="127.0.0.1" port="6688"/>
+      </source>
+      <model type="virtio"/>
     </interface>
 
     <controller type='virtio-serial' index='0'/>
@@ -110,4 +106,5 @@
       <backend model='random'>/dev/random</backend>
     </rng>
   </devices>
+
 </domain>
diff --git a/usr/share/libvirt-dist/xml/Whonix-Internal.xml b/usr/share/libvirt-dist/xml/Whonix-Internal.xml
deleted file mode 100644
index 553eeef..0000000
--- a/usr/share/libvirt-dist/xml/Whonix-Internal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<network>
-  <name>Whonix-Internal</name>
-  <bridge name='virbr2' stp='on' delay='0'/>
-  <dns enable="no"/>
-</network>
diff --git a/usr/share/libvirt-dist/xml/Whonix-Workstation.xml b/usr/share/libvirt-dist/xml/Whonix-Workstation.xml
index dc641ed..6b66275 100644
--- a/usr/share/libvirt-dist/xml/Whonix-Workstation.xml
+++ b/usr/share/libvirt-dist/xml/Whonix-Workstation.xml
@@ -12,10 +12,6 @@
     <nosharepages/>
   </memoryBacking>
 
-  <blkiotune>
-    <weight>250</weight>
-  </blkiotune>
-
   <vcpu placement='static' cpuset='1'>1</vcpu>
   <cpu mode='host-passthrough'/>
 
@@ -51,16 +47,17 @@
   </pm>
 
   <devices>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/Whonix-Workstation.qcow2'/>
-      <target dev='vda' bus='virtio'/>
+    <disk type="volume" device="disk">
+      <driver name="qemu" type="qcow2"/>
+      <source pool="default" volume="Whonix-Workstation.qcow2"/>
+      <target dev="vda" bus="virtio"/>
     </disk>
 
-    <interface type='network'>
-      <source network='Whonix-Internal'/>
-      <model type='virtio'/>
-      <driver name='qemu'/>
+    <interface type='udp'>
+      <source address='127.0.0.1' port='6688'>
+        <local address='127.0.0.1' port='5577'/>
+      </source>
+      <model type="virtio"/>
     </interface>
 
     <controller type='virtio-serial' index='0'/>
@@ -104,4 +101,5 @@
       <backend model='random'>/dev/random</backend>
     </rng>
   </devices>
+
 </domain>