diff --git a/playbooks/include/deploy-kvm-guest.yml b/playbooks/include/deploy-kvm-guest.yml
index 4bdb5d1..3b72157 100644
--- a/playbooks/include/deploy-kvm-guest.yml
+++ b/playbooks/include/deploy-kvm-guest.yml
@@ -9,7 +9,7 @@
 
     char: "{{ 'bcdefghijklmnopqrstuvwxyz'|list }}"
     console_log: "/var/log/libvirt/qemu/{{ inventory_hostname }}.console.log"
-    os_disk_image: "/srv/libvirt/ssd/{{ inventory_hostname }}.a.img"
+    os_disk_image: "/srv/libvirt/os/{{ inventory_hostname }}.a.img"
     dsk_opts: bus=virtio,cache=none,device=disk,format=raw,sparse=no
 
     inject: >-
diff --git a/playbooks/vmhost.yml b/playbooks/vmhost.yml
index 66a3139..f01b865 100644
--- a/playbooks/vmhost.yml
+++ b/playbooks/vmhost.yml
@@ -26,6 +26,15 @@
         passno: "0"
         dump: "0"
         state: mounted
+    - name: Mount /export/libvirt/os
+      ansible.posix.mount:
+        name: /export/libvirt/os
+        src: LABEL=os
+        fstype: xfs
+        opts: noatime,noexec,nosuid,nodev
+        passno: "0"
+        dump: "0"
+        state: mounted
     - name: Mount /export/libvirt/ssd
       ansible.posix.mount:
         name: /export/libvirt/ssd
@@ -35,6 +44,7 @@
         passno: "0"
         dump: "0"
         state: mounted
+      when: inventory_hostname == "vmhost01.home.foo.sh"
 
   roles:
     - base
diff --git a/roles/kvm_host/tasks/main.yml b/roles/kvm_host/tasks/main.yml
index 1b1748a..6ed94d4 100644
--- a/roles/kvm_host/tasks/main.yml
+++ b/roles/kvm_host/tasks/main.yml
@@ -35,7 +35,9 @@
   with_items:
     - /export/libvirt
     - /export/libvirt/hdd
+    - /export/libvirt/nvme
     - /export/libvirt/ssd
+    - /export/libvirt/os
 
 - name: Link data directory
   ansible.builtin.file: