diff --git a/chroot.sh b/chroot.sh
index edc677e..64f2489 100755
--- a/chroot.sh
+++ b/chroot.sh
@@ -6,6 +6,8 @@ cp /root/arch-dev-vm/locale.gen /etc/locale.gen
 
 hwclock --systohc
 
+driveName=cat /root/arch-dev-vm/drive
+
 locale-gen
 
 echo "LANG=en_GB.UTF-8" > /etc/locale.conf
@@ -23,7 +25,16 @@ sleep 2
 mkinitcpio -P
 plymouth-set-default-theme -R script
 
-grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=ARCH
+# Test boot mode (if efi or csm)
+
+bootMode=cat /sys/firmware/efi/fw_platform_size
+
+if ["$bootMode" == '64' ]; then
+    mkdir /boot/EFI
+    grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=ARCH
+else
+    grub-install --target=i386-pc "/dev/${driveName}"
+fi
 grub-mkconfig -o /boot/grub/grub.cfg
 
 echo "
diff --git a/install.sh b/install.sh
index 9626a3e..7d45626 100755
--- a/install.sh
+++ b/install.sh
@@ -37,6 +37,9 @@ if [[ "$doProceed" != "y" ]]; then
     exit 0
 fi
 
+# Save drive name for future use
+echo "${driveName}" > ~/arch-dev-vm/drive
+
 echo "
 
 ==> Please stand by as we install your OS.
@@ -82,7 +85,6 @@ echo "y\n" | mkfs.ext4 "/dev/${driveName}3"
 echo "y\n" | mkfs.fat -F 32 "/dev/${driveName}2"
 mount "/dev/${driveName}3" /mnt
 mkdir /mnt/boot
-mkdir /mnt/boot/EFI
 mount "/dev/${driveName}2" /mnt/boot
 
 pacstrap -K /mnt base linux-zen linux-firmware nano networkmanager efibootmgr grub man git xfce4 base-devel fish sudo gdm plymouth neovim --noconfirm