diff --git a/roles/zbee-mount/tasks/main.yml b/roles/zbee-mount/tasks/main.yml
index 86ae9016..c8ad4500 100644
--- a/roles/zbee-mount/tasks/main.yml
+++ b/roles/zbee-mount/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Deploy /home systemd mounts
   template:
-    src: "systemd/system/home-{{ item }}.mount.j2"
+    src: "systemd/system/home.mount.j2"
     dest: "/etc/systemd/system/home-{{ item }}.mount"
     mode: 0755
   loop:
diff --git a/roles/zbee-mount/templates/systemd/system/home-b.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-b.mount.j2
deleted file mode 100644
index 5619f224..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-b.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/b
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-b-part1
-Where=/home-adh/b
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-c.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-c.mount.j2
deleted file mode 100644
index ba1b3942..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-c.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/c
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-c-part1
-Where=/home-adh/c
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-d.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-d.mount.j2
deleted file mode 100644
index 3398e1ab..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-d.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/d
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-d-part1
-Where=/home-adh/d
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-e.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-e.mount.j2
deleted file mode 100644
index 0e654012..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-e.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/e
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-e-part1
-Where=/home-adh/e
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-f.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-f.mount.j2
deleted file mode 100644
index 13bfdae6..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-f.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/f
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-f-part1
-Where=/home-adh/f
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-g.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-g.mount.j2
deleted file mode 100644
index b896d77d..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-g.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/g
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-g-part1
-Where=/home-adh/g
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-h.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-h.mount.j2
deleted file mode 100644
index 283078b4..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-h.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/h
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-h-part1
-Where=/home-adh/h
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-i.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-i.mount.j2
deleted file mode 100644
index 88686c6f..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-i.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/i
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-i-part1
-Where=/home-adh/i
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-j.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-j.mount.j2
deleted file mode 100644
index ebbfede3..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-j.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/j
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-j-part1
-Where=/home-adh/j
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-k.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-k.mount.j2
deleted file mode 100644
index 349242e7..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-k.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/k
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-k-part1
-Where=/home-adh/k
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-l.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-l.mount.j2
deleted file mode 100644
index b54a1f68..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-l.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/l
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-l-part1
-Where=/home-adh/l
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-logs.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-logs.mount.j2
deleted file mode 100644
index d329834c..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-logs.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/logs
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-logs-part1
-Where=/home-adh/logs
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-m.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-m.mount.j2
deleted file mode 100644
index da688e83..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-m.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/m
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-m-part1
-Where=/home-adh/m
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-mail.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-mail.mount.j2
deleted file mode 100644
index 2e2cbd01..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-mail.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/mail
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-mail-part1
-Where=/home-adh/mail
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-n.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-n.mount.j2
deleted file mode 100644
index d447c049..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-n.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/n
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-n-part1
-Where=/home-adh/n
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-o.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-o.mount.j2
deleted file mode 100644
index 1aa6bb2d..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-o.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/o
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-o-part1
-Where=/home-adh/o
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-p.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-p.mount.j2
deleted file mode 100644
index a00a9550..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-p.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/p
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-p-part1
-Where=/home-adh/p
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-q.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-q.mount.j2
deleted file mode 100644
index e88178d5..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-q.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/q
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-q-part1
-Where=/home-adh/q
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-r.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-r.mount.j2
deleted file mode 100644
index 54a5f6db..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-r.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/r
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-r-part1
-Where=/home-adh/r
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-s.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-s.mount.j2
deleted file mode 100644
index 95a62054..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-s.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/s
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-s-part1
-Where=/home-adh/s
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-t.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-t.mount.j2
deleted file mode 100644
index 209047f9..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-t.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/t
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-t-part1
-Where=/home-adh/t
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-u.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-u.mount.j2
deleted file mode 100644
index ac4b4e77..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-u.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/u
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-u-part1
-Where=/home-adh/u
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-v.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-v.mount.j2
deleted file mode 100644
index d199c197..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-v.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/v
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-v-part1
-Where=/home-adh/v
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-w.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-w.mount.j2
deleted file mode 100644
index 16a63dd2..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-w.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/w
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-w-part1
-Where=/home-adh/w
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-x.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-x.mount.j2
deleted file mode 100644
index 7e794cc0..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-x.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/x
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-x-part1
-Where=/home-adh/x
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-y.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-y.mount.j2
deleted file mode 100644
index bd256fe6..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-y.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/y
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-y-part1
-Where=/home-adh/y
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-z.mount.j2 b/roles/zbee-mount/templates/systemd/system/home-z.mount.j2
deleted file mode 100644
index a21ba6ca..00000000
--- a/roles/zbee-mount/templates/systemd/system/home-z.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-[Unit]
-Description=Mount /home-adh/z
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-z-part1
-Where=/home-adh/z
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/zbee-mount/templates/systemd/system/home-a.mount.j2 b/roles/zbee-mount/templates/systemd/system/home.mount.j2
similarity index 68%
rename from roles/zbee-mount/templates/systemd/system/home-a.mount.j2
rename to roles/zbee-mount/templates/systemd/system/home.mount.j2
index e0dce90f..65a1a795 100644
--- a/roles/zbee-mount/templates/systemd/system/home-a.mount.j2
+++ b/roles/zbee-mount/templates/systemd/system/home.mount.j2
@@ -1,11 +1,11 @@
 # {{ ansible_managed }}
 [Unit]
-Description=Mount /home-adh/a
+Description=Mount /home-adh/{{ item }}
 After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
 
 [Mount]
-What=/dev/mapper/mpath-home-a-part1
-Where=/home-adh/a
+What=/dev/mapper/mpath-home-{{ item }}-part1
+Where=/home-adh/{{ item }}
 Type=ext4
 Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail