diff --git a/step2/10-disk b/step2/10-disk
index 24d105f..749b857 100644
--- a/step2/10-disk
+++ b/step2/10-disk
@@ -158,8 +158,7 @@ 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})"
-setconf add partuuid "$(blkid -o value -s UUID /dev/mapper/voidvg.${diskid}-root)"
+setconf add partuuid "$(blkid -o value -s UUID ${target_partition_tmp})"
 [[ "${cfg[fde_key_store]}" == "once" ]] && setconf "add" "bootuuid" "$(blkid -o value -s UUID ${target_boot})"
 setconf add swapuuid "$(blkid -o value -s UUID /dev/mapper/voidvg.${diskid}-swap)"
 
diff --git a/step3/30-bootloader b/step3/30-bootloader
index 4078b5d..e2849d5 100644
--- a/step3/30-bootloader
+++ b/step3/30-bootloader
@@ -13,7 +13,7 @@ if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
 
 	if [[ "${cfg[fde_key_store]}" == "initramfs" ]]; then
 		dd bs=1 count=64 if=/dev/urandom of=/boot/volume.key
-		echo -n "${cfg[diskpw]}" | cryptsetup luksAddKey "${target_partition}" /boot/volume.key -d -
+		echo -n "${cfg[diskpw]}" | cryptsetup luksAddKey "${target_partition_tmp}" /boot/volume.key -d -
 		chmod 000 /boot/volume.key
 		chmod -R g-rwx,o-rwx /boot
 		echo 'install_items+=" /boot/volume.key /etc/crypttab "' > /etc/dracut.conf.d/crypt-ssh.conf