diff --git a/group_vars/adm.yml b/group_vars/adm.yml
index dce7311..0eff70a 100644
--- a/group_vars/adm.yml
+++ b/group_vars/adm.yml
@@ -1,7 +1,6 @@
 ---
-
 datadisks:
-  - 10
+  - {size: 10}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/collab.yml b/group_vars/collab.yml
index 8f92dbb..0eff70a 100644
--- a/group_vars/collab.yml
+++ b/group_vars/collab.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 10
+  - {size: 10}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/git.yml b/group_vars/git.yml
index dce7311..0eff70a 100644
--- a/group_vars/git.yml
+++ b/group_vars/git.yml
@@ -1,7 +1,6 @@
 ---
-
 datadisks:
-  - 10
+  - {size: 10}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/influxdb.yml b/group_vars/influxdb.yml
index e14ccc2..d500bf1 100644
--- a/group_vars/influxdb.yml
+++ b/group_vars/influxdb.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 100
+  - {size: 100}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/jenkins.yml b/group_vars/jenkins.yml
index e14ccc2..d500bf1 100644
--- a/group_vars/jenkins.yml
+++ b/group_vars/jenkins.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 100
+  - {size: 100}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/log.yml b/group_vars/log.yml
index b25b970..3c03205 100644
--- a/group_vars/log.yml
+++ b/group_vars/log.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 50
+  - {siez: 50}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/mail.yml b/group_vars/mail.yml
index d6a68c7..7976023 100644
--- a/group_vars/mail.yml
+++ b/group_vars/mail.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 10
+  - {size: 10}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/minecraft.yml b/group_vars/minecraft.yml
index 937b32e..cf60405 100644
--- a/group_vars/minecraft.yml
+++ b/group_vars/minecraft.yml
@@ -1,7 +1,7 @@
 ---
 mem_size: 4096
 datadisks:
-  - 100
+  - {size: 100}
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
   - {proto: tcp, port: 4949, from: [172.20.30.0/24]}
diff --git a/group_vars/mirror.yml b/group_vars/mirror.yml
index deaae99..4ac63b1 100644
--- a/group_vars/mirror.yml
+++ b/group_vars/mirror.yml
@@ -1,7 +1,7 @@
 ---
 
 datadisks:
-  - 1000
+  - {size: 1000}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/mongodb.yml b/group_vars/mongodb.yml
index 2bf3f03..bb49905 100644
--- a/group_vars/mongodb.yml
+++ b/group_vars/mongodb.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 20
+  - {size: 20}
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
   - {proto: tcp, port: 27017, from: [172.20.20.0/22]}
diff --git a/group_vars/munin.yml b/group_vars/munin.yml
index c6c7200..6b6d92b 100644
--- a/group_vars/munin.yml
+++ b/group_vars/munin.yml
@@ -1,10 +1,7 @@
 ---
-
-# more cpu to create graphs
 num_cpus: 4
-
 datadisks:
-  - 10
+  - {size: 10}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/nas.yml b/group_vars/nas.yml
index 44ec14a..7d7e282 100644
--- a/group_vars/nas.yml
+++ b/group_vars/nas.yml
@@ -1,9 +1,9 @@
 ---
-
-mem_size: 4096
+mem_size: 8192
 num_cpus: 2
 datadisks:
-  - 1000
+   - {size: 1000}
+   - {size: 400, type: nvme}
 
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
diff --git a/group_vars/nms.yml b/group_vars/nms.yml
index a100060..b487f7e 100644
--- a/group_vars/nms.yml
+++ b/group_vars/nms.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 10
+  - {size: 10}
 
 network_vip_interfaces:
   - device: eth1
diff --git a/group_vars/sqldb.yml b/group_vars/sqldb.yml
index 1042d86..1c899e3 100644
--- a/group_vars/sqldb.yml
+++ b/group_vars/sqldb.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 20
+  - {size: 20}
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
   - {proto: tcp, port: 3306, from: [172.20.20.0/22]}
diff --git a/group_vars/sshsign.yml b/group_vars/sshsign.yml
index e479a50..91ca329 100644
--- a/group_vars/sshsign.yml
+++ b/group_vars/sshsign.yml
@@ -1,6 +1,6 @@
 ---
 datadisks:
-  - 10
+  - {size: 10}
 firewall_in:
   - {proto: tcp, port: 22, from: [172.20.20.0/22]}
   - {proto: tcp, port: 443}
diff --git a/group_vars/zm.yml b/group_vars/zm.yml
index 2fd0b6b..4da1f4f 100644
--- a/group_vars/zm.yml
+++ b/group_vars/zm.yml
@@ -1,8 +1,8 @@
 ---
-datadisks:
-  - 500
 mem_size: 4096
 num_cpus: 2
+datadisks:
+  - {size: 500}
 
 network_vip_interfaces:
   - device: eth1
diff --git a/host_vars/backup02.home.foo.sh.yml b/host_vars/backup02.home.foo.sh.yml
index c670384..651b34f 100644
--- a/host_vars/backup02.home.foo.sh.yml
+++ b/host_vars/backup02.home.foo.sh.yml
@@ -5,6 +5,6 @@ network_interfaces:
     vlan: 20
     mac: 52:54:00:ac:dc:50
 datadisks:
-  - 1000
+  - {size: 1000}
 passthrough_devices:
   - "07:04.0"
diff --git a/host_vars/ldap01.home.foo.sh.yml b/host_vars/ldap01.home.foo.sh.yml
index f10956d..8951d67 100644
--- a/host_vars/ldap01.home.foo.sh.yml
+++ b/host_vars/ldap01.home.foo.sh.yml
@@ -5,6 +5,6 @@ network_interfaces:
     vlan: 20
     mac: 52:54:00:ac:dc:1f
 datadisks:
-  - 10
+  - {size: 10}
 
 ldap_master: true
diff --git a/playbooks/include/deploy-kvm-guest.yml b/playbooks/include/deploy-kvm-guest.yml
index 94cc48e..055128d 100644
--- a/playbooks/include/deploy-kvm-guest.yml
+++ b/playbooks/include/deploy-kvm-guest.yml
@@ -11,7 +11,6 @@
     console_log: "/var/log/libvirt/qemu/{{ inventory_hostname }}.console.log"
     os_disk_image: "/srv/libvirt/ssd/{{ inventory_hostname }}.a.img"
     dsk_opts: bus=virtio,cache=none,device=disk,format=raw
-    base: /srv/libvirt/hdd/{{ inventory_hostname }}
 
     inject: >-
       {% if not '--cdrom' in virt_install_os_args %}{{ true }}{% endif %}
@@ -19,7 +18,13 @@
     virt_install_disks: >-
       {% if datadisks is defined %}
       {%   for i in range(datadisks|count) %}
-      --disk {{ base }}.{{ char[i] }}.img,{{ dsk_opts }},size={{ datadisks[i] }},sparse=no
+      {%     if datadisks[i].type is defined %}
+      {%       set type = datadisks[i].type %}
+      {%     else %}
+      {%       set type = "hdd" %}
+      {%     endif %}
+      {%     set base = "/srv/libvirt/" +  type + "/" + inventory_hostname %}
+      --disk {{ base }}.{{ char[i] }}.img,{{ dsk_opts }},size={{ datadisks[i].size }},sparse=no
       {%   endfor %}
       {% endif %}
 
diff --git a/playbooks/nas.yml b/playbooks/nas.yml
index af11f8f..8d62e06 100644
--- a/playbooks/nas.yml
+++ b/playbooks/nas.yml
@@ -9,10 +9,19 @@
   vars_files:
     - "{{ ansible_private }}/vars.yml"
   pre_tasks:
-    - name: mount /export
+    - name: mount /export/home
       mount:
-        name: /export
-        src: LABEL=/export
+        name: /export/home
+        src: LABEL=home
+        fstype: xfs
+        opts: noatime
+        passno: "0"
+        dump: "0"
+        state: mounted
+    - name: mount /export/roles
+      mount:
+        name: /export/roles
+        src: LABEL=roles
         fstype: xfs
         opts: noatime
         passno: "0"