diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb b/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
index f35e2a9..29345e9 100644
--- a/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
@@ -4,7 +4,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 SECTION = ""
 DEPENDS = ""
 
-SRC_URI = "file://initrd-release file://crypttab file://11-dm.rules file://citadel-rootfs-mount.service"
+SRC_URI = "\
+    file://initrd-release \
+    file://crypttab \
+    file://11-dm.rules \
+    file://citadel-rootfs-mount.path \
+    file://citadel-rootfs-mount.service \
+"
 
 S = "${WORKDIR}"
 
@@ -17,6 +23,7 @@ do_install() {
     done
 
     install -d ${D}${systemd_system_unitdir}
+    #install -m 644 ${WORKDIR}/citadel-rootfs-mount.path ${D}${systemd_system_unitdir}
     install -m 644 ${WORKDIR}/citadel-rootfs-mount.service ${D}${systemd_system_unitdir}
     install -d ${D}${sysconfdir}
     install -m 644 ${WORKDIR}/initrd-release ${D}${sysconfdir}
diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.path b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.path
new file mode 100644
index 0000000..0975326
--- /dev/null
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.path
@@ -0,0 +1,8 @@
+[Unit]
+Description=Watch for new entries in /dev/mapper
+
+[Path]
+PathChanged=/dev/mapper
+
+[Install]
+WantedBy=initrd-root-fs.target
diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.service
index c41c506..aa62747 100644
--- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.service
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-mount.service
@@ -3,6 +3,5 @@ Description=Mount citadel rootfs
 
 [Service]
 Type=oneshot
-RemainAfterExit=yes
-
+RemainAfterExit=no
 ExecStart=/bin/sh -c 'echo "hello world"'