diff --git a/build-iso.sh b/build-iso.sh
index 3c3c7c6..af70ea0 100755
--- a/build-iso.sh
+++ b/build-iso.sh
@@ -107,6 +107,9 @@ xorriso -as mkisofs \
   -o "$OUTPUT_ISO" \
   . 2>&1 | tail -5
 
+# Make the ISO bootable from USB on both BIOS and UEFI machines
+isohybrid --uefi "$OUTPUT_ISO"
+
 echo
 SIZE=$(du -sh "$OUTPUT_ISO" | cut -f1)
 echo "==> ✓ ISO complete: $OUTPUT_ISO ($SIZE)"
diff --git a/iso-output/seniornet-kiosk.iso b/iso-output/seniornet-kiosk.iso
index a8f21b5..be73ac7 100644
Binary files a/iso-output/seniornet-kiosk.iso and b/iso-output/seniornet-kiosk.iso differ