diff --git a/README.md b/README.md
index ddfb1e5..f3fe70d 100644
--- a/README.md
+++ b/README.md
@@ -37,13 +37,19 @@ Due to [licensing concerns with OpenZFS and Linux](https://openzfs.github.io/ope
       --graphics vnc,listen=127.0.0.1,port=5901 \
       --boot uefi,loader=/usr/shar/OVMF/OVMF_CODE.fd
     ```
-6. If dropped into initramfs
+6. If dropped into UEFI shell
+    ```
+    Shell> FS0:
+    FS0:\> EFI\debian\grubx64.efi
+    ```
+
+7. If dropped into initramfs
     ```
     zpool import -f rpool
     exit
     ```
-7. Enter rpool password
-8. Login with root's password
+8. Enter rpool password
+9. Login with root's password
 
 ### License
 - DebianZFS is licensed under 0BSD, a public domain equivalent license; see the `LICENSE` file for more information
\ No newline at end of file
diff --git a/debianzfs.sh b/debianzfs.sh
index 6298e9e..cd9b9d5 100644
--- a/debianzfs.sh
+++ b/debianzfs.sh
@@ -32,8 +32,8 @@ swapoff --all
 
 # Partition
 sgdisk -n2:1M:+512M -t2:EF00 "$DISK"
-sgdisk -n3:0:+1G -t3:BF01 "$DISK"
-sgdisk -n4:0:0 -t4:BF00 "$DISK"
+sgdisk -n3:0:+1G    -t3:BF01 "$DISK"
+sgdisk -n4:0:0      -t4:BF00 "$DISK"
 
 # Create boot pool
 zpool create -f \
@@ -176,9 +176,10 @@ echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf
 # Install Grub for UEFI
 apt-get install -y dosfstools
 echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf
-mkdosfs -F 32 -s 1 -n EFI "${DISK}2"
+mkdosfs -F 32 -s 1 -n EFI "\${DISK}2"
 mkdir /boot/efi
-echo "${DISK}2" /boot/efi vfat defaults 0 0 >> /etc/fstab
+BLKID_BOOT="/dev/disk/by-uuid/\$(blkid -s UUID -o value \${DISK}2)"
+echo "\${BLKID_BOOT} /boot/efi vfat defaults 0 0" >> /etc/fstab
 mount /boot/efi
 apt-get install -y grub-efi-amd64 shim-signed
 apt-get purge -y os-prober