diff --git a/gentoo-install.sh b/gentoo-install.sh
index ec46536..b6fbe8a 100755
--- a/gentoo-install.sh
+++ b/gentoo-install.sh
@@ -308,12 +308,14 @@ function stage_step() {
 		${cmd} rm -f /mnt/gentoo/etc/machine-id
 	fi
 	${cmd} arch-chroot /mnt/gentoo systemd-machine-id-setup
+	${cmd} arch-chroot /mnt/gentoo systemd-firstboot --prompt
+	${cmd} arch-chroot /mnt/gentoo systemctl preset-all --preset-mode=enable-only
 	${cmd} arch-chroot /mnt/gentoo emerge --sync
 	${cmd} arch-chroot /mnt/gentoo grub-install --efi-directory=/efi
 	#arch-chroot /mnt/gentoo dracut --host-only
 	while read -r rd; do
 		rd="$(basename "$rd")"
-		${cmd} arch-chroot --force "/boot/initramfs-${rd}.img" --kver "$rd"
+		${cmd} arch-chroot /mnt/gentoo dracut --force "/boot/initramfs-${rd}.img" --kver "$rd"
 	done < <(find /mnt/gentoo/lib/modules -mindepth 1 -maxdepth 1 -type d)
 	${cmd} arch-chroot /mnt/gentoo grub-mkconfig -o /boot/grub/grub.cfg
 }