diff --git a/entry.sh b/entry.sh
index 265bc63..2bebd08 100755
--- a/entry.sh
+++ b/entry.sh
@@ -136,7 +136,7 @@ function first_stage(){
 
 	genfstab -U $TARGET | tee $TARGET/etc/fstab
 	UUID=$(lsblk -lpo NAME,UUID | grep ${DEVICE}2 | awk '{print $2}')
-	echo cryptlvm UUID=${UUID} none luks > $TARGET/etc/crypttab
+	echo cryptlvm UUID=${UUID} none luks,initramfs > $TARGET/etc/crypttab
 }
 
 function second_stage(){
@@ -152,10 +152,10 @@ function second_stage(){
 	hostname $NEW_HOSTNAME
 	sed -i 's/main/main contrib non-free/g' /etc/apt/sources.list
 	apt update
-	apt install -y linux-image-amd64 grub2 cryptsetup btrfs-progs lvm2 firmware-iwlwifi locales tzdata keyboard-configuration console-common zsh intel-microcode
+	apt install -y linux-image-amd64 grub2 cryptsetup cryptsetup-initramfs cryptsetup-suspend btrfs-progs lvm2 firmware-iwlwifi locales tzdata keyboard-configuration console-common zsh intel-microcode
 	grub-install ${DEVICE}
 	update-grub
-	update-initramfs -u
+	update-initramfs -k all -u
 	mkdir /snap
 	btrfs subvolume snapshot / /snap/$(date +%Y-%m-%d_basesystem)
 	apt install -y task-mate-desktop mate-desktop-environment-extra