diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb b/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
index 4a89217..3788467 100644
--- a/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
@@ -13,7 +13,6 @@ SRC_URI = "\
     file://citadel-rootfs-mount.service \
     file://citadel-rootfs-setup.service \
     file://citadel-install-rootfs-mount.service \
-    file://citadel-install-rootfs-setup.service \
     file://99-grsec.conf \
 "
 
@@ -33,7 +32,6 @@ do_install() {
     install -m 644 ${WORKDIR}/citadel-rootfs-mount.service ${D}${systemd_system_unitdir}
     install -m 644 ${WORKDIR}/citadel-rootfs-setup.service ${D}${systemd_system_unitdir}
     install -m 644 ${WORKDIR}/citadel-install-rootfs-mount.service ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/citadel-install-rootfs-setup.service ${D}${systemd_system_unitdir}
 
     install -d ${D}${systemd_system_unitdir}/sysinit.target.wants
     ln -s ../citadel-rootfs-mount.path ${D}${systemd_system_unitdir}/sysinit.target.wants/citadel-rootfs-mount.path
diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service
index d837baa..9e72843 100644
--- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-mount.service
@@ -22,5 +22,4 @@ Before=citadel-rootfs-setup.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStartPre=-/usr/bin/plymouth message --text="Copying files from boot disk and decompressing rootfs image"
-ExecStart=/usr/libexec/citadel-install copy-artifacts
-ExecStart=/usr/libexec/citadel-mount rootfs
+ExecStart=/usr/libexec/citadel-boot rootfs
diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service
index 938776e..adf48ce 100644
--- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-install-rootfs-setup.service
@@ -15,5 +15,5 @@ ConditionKernelCommandLine=|citadel.live
 Type=oneshot
 RemainAfterExit=yes
 ExecStartPre=-/usr/bin/plymouth message --text="Setting up filesystem in RAM for live boot"
-ExecStart=/usr/libexec/citadel-install live-setup
+ExecStart=/usr/libexec/citadel-boot setup
 ExecStartPost=-/usr/bin/plymouth message --text="Starting desktop"
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 c051d78..62299d9 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
@@ -13,6 +13,7 @@ ConditionPathExists=/dev/mapper/citadel-storage
 # Pull in the unit that mounts 'extra' and 'kernel' images
 #
 Wants=citadel-rootfs-setup.service
+Before=citadel-rootfs-setup.service
 
 #
 # citadel-mount needs to run in pax soft mode
@@ -21,6 +22,7 @@ Requires=systemd-sysctl.service
 After=systemd-sysctl.service
 
 [Service]
+KeyringMode=shared
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/libexec/citadel-mount rootfs
+ExecStart=/usr/libexec/citadel-boot rootfs
diff --git a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-setup.service b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-setup.service
index f7ca1f3..b2964ad 100644
--- a/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-setup.service
+++ b/meta-citadel/recipes-initrd/citadel-initramfs/files/citadel-rootfs-setup.service
@@ -8,8 +8,7 @@ Before=initrd-root-fs.target shutdown.target
 AssertPathExists=/etc/initrd-release
 
 [Service]
+KeyringMode=shared
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/libexec/citadel-mount overlay
-ExecStart=/usr/libexec/citadel-mount kernel
-ExecStart=/usr/libexec/citadel-mount extra 
+ExecStart=/usr/libexec/citadel-boot setup