diff --git a/base.sh b/base.sh
index d868680..39de516 100755
--- a/base.sh
+++ b/base.sh
@@ -59,14 +59,17 @@ bootctl install
 root="$(findmnt -nr -o source /)"
 cryptdev="$(cryptsetup status "$root" | grep device | awk '{print $2}' || true)"
 if [ -n "$cryptdev" ]; then
-    uuid="$(blkid | grep /dev/nvme0n1p2 | awk '{print $2}')"
+    uuid="$(blkid | grep "$cryptdev" | awk '{print $2}')"
     options="cryptdevice=$uuid:$(basename "$root") "
 fi
 
 options="${options}root=$root"
 
 for f in /boot/loader/entries/*.conf; do
-    echo "options $options rw" >> "$f"
+    cat << EOF >> "$f"
+initrd  /$cpu-ucode.img
+options $options rw
+EOF
 done
 
 echo -e "${BOLD}${GREEN}DONE. You can install a desktop environment \
diff --git a/rootfs/boot/loader/entries/arch-fallback.conf b/rootfs/boot/loader/entries/arch-fallback.conf
index e54af09..974bc28 100755
--- a/rootfs/boot/loader/entries/arch-fallback.conf
+++ b/rootfs/boot/loader/entries/arch-fallback.conf
@@ -1,4 +1,3 @@
 title   Arch Linux (fallback)
 linux   /vmlinuz-linux
 initrd  /initramfs-linux-fallback.img
-initrd  /$cpu-ucode.img
diff --git a/rootfs/boot/loader/entries/arch.conf b/rootfs/boot/loader/entries/arch.conf
index ff38931..9833d66 100755
--- a/rootfs/boot/loader/entries/arch.conf
+++ b/rootfs/boot/loader/entries/arch.conf
@@ -1,4 +1,3 @@
 title   Arch Linux
 linux   /vmlinuz-linux
 initrd  /initramfs-linux.img
-initrd  /$cpu-ucode.img