diff --git a/step2/10-disk b/step2/10-disk
index 749b857..ac6333d 100644
--- a/step2/10-disk
+++ b/step2/10-disk
@@ -159,6 +159,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 partuuid "$(blkid -o value -s UUID ${target_partition_tmp})"
+setconf add efiuuid "$(blkid -o value -s UUID ${efipart})"
 [[ "${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/20-basesystem b/step3/20-basesystem
index 02e18d8..746f5d5 100644
--- a/step3/20-basesystem
+++ b/step3/20-basesystem
@@ -103,7 +103,7 @@ if [[ "${cfg[fde_key_store]}" == "once" ]]; then
 	echo "UUID=${cfg[bootuuid]}	/var/lib/backup/quelle/bootfs		btrfs	defaults	0 0"; } >> /etc/fstab
 fi
 if test -d /sys/firmware/efi; then
-	echo "${efipart} /boot/efi vfat defaults 0 0" >> /etc/fstab
+	echo "UUID=${cfg[efiuuid]} /boot/efi vfat defaults 0 0" >> /etc/fstab
 fi
 
 echo "${cfg[hostname]}" > /etc/hostname