diff --git a/auto/config b/auto/config
index 2d5f486..bead443 100755
--- a/auto/config
+++ b/auto/config
@@ -82,7 +82,7 @@ case "$arch" in
 	lb_opts="$lb_opts --debian-installer live --linux-flavours 686-pae"
     ;;
     arm64)
-  lb_opts="$lb_opts --bootloaders grub-efi --uefi-secure-boot disable --win32-loader true"
+	lb_opts="$lb_opts --bootloaders grub-efi --uefi-secure-boot disable"
     ;;
     armel|armhf)
 	lb_opts="$lb_opts --binary-images hdd --binary-filesystem ext4 --chroot-filesystem none"
diff --git a/build.sh b/build.sh
index afd43fc..4da58df 100755
--- a/build.sh
+++ b/build.sh
@@ -259,11 +259,11 @@ case "$IMAGE_TYPE" in
 		    >simple-cdd/profiles/kali.downloads
 		# Tasksel is required in the mirror for debian-cd
 		echo tasksel >>simple-cdd/profiles/kali.downloads
-    # Grub is the only supported bootloader on arm64
-    # so ensure it's on the iso for arm64.
-    if [ "$ARCH" = "arm64" ]; then
-      echo "grub-efi-arm64" >>simple-cdd/profiles/kali.downloads
-    fi
+		# Grub is the only supported bootloader on arm64
+		# so ensure it's on the iso for arm64.
+		if [ "$KALI_ARCH" = "arm64" ]; then
+		    echo "grub-efi-arm64" >>simple-cdd/profiles/kali.downloads
+		fi
 
 		# Update the postinst script
 		cp bin/kali-finish-install simple-cdd/profiles/kali.postinst