diff --git a/modules/disk/bios/postconfig b/modules/disk/bios/postconfig
index b137f56..676bd2f 100644
--- a/modules/disk/bios/postconfig
+++ b/modules/disk/bios/postconfig
@@ -75,24 +75,29 @@ lvcreate -q -y --name root -l 100%FREE "voidvg.${diskid}"
 sleep 1
 mkfs.btrfs -q -f "/dev/mapper/voidvg.${diskid}-root"
 mkswap "/dev/mapper/voidvg.${diskid}-swap"
+
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"
 btrfs subvol create "${dest}/rootfs"
 btrfs subvol create "${dest}/homefs"
 mkdir -p "${dest}/system/snapshots/update" "${dest}/system/snapshots/regular" "${dest}/system/backup"
-
 umount "${dest}"
+
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}" -o subvol=rootfs
 for i in boot home dev proc sys tmp etc var/lib/backup/quelle/rootfs var/lib/backup/ziel var/db; do mkdir -p "${dest}/${i}"; done
+
 mount "/dev/mapper/voidvg.${diskid}-root" "${dest}"/home -o subvol=homefs
+mkdir -p "${dest}/var/lib/backup/quelle/bootfs"
+
+mkfs.btrfs -q -f "${target_boot}"
+mount "${target_boot}" "${dest}/boot"
+btrfs subvol create "${dest}/boot/bootfs"
+mkdir -p "${dest}/boot/system/snapshots/update" "${dest}/boot/system/snapshots/regular" "${dest}/boot/system/backup"
+umount "${dest}/boot"
+
 if [[ "${cfg[fde_key_store]}" == "once" ]]; then
-	mkdir -p "${dest}/var/lib/backup/quelle/bootfs"
-	mkfs.btrfs -q -f "${target_boot}"
-	mount "${target_boot}" "${dest}/boot"
-	btrfs subvol create "${dest}/boot/bootfs"
-	mkdir -p "${dest}/boot/system/snapshots/update" "${dest}/boot/system/snapshots/regular" "${dest}/boot/system/backup"
-	umount "${dest}/boot"
 	mount "${target_boot}" "${dest}/boot" -o subvol=bootfs
 fi
+
 for dir in dev proc sys run; do mkdir -p "${dest}"/$dir ; mount --rbind /$dir "${dest}"/$dir ; mount --make-rslave "${dest}"/$dir ; done
 
 setconf add rootuuid "$(blkid -o value -s UUID ${target_partition})"