diff --git a/build-iso.sh b/build-iso.sh
index 9cfa644..3c3c7c6 100755
--- a/build-iso.sh
+++ b/build-iso.sh
@@ -97,18 +97,13 @@ cd "$WORK_DIR/iso"
 xorriso -as mkisofs \
   -r -J -joliet-long \
   -V "SeniorNet Kiosk" \
-  --grub2-mbr boot/grub/i386-pc/boot_hybrid.img \
-  -partition_offset 16 \
-  --mbr-force-bootable \
-  -append_partition 2 28732ac11ff8d211ba4b00a0c93ec93b boot/grub/efi.img \
-  -appended_part_as_gpt \
-  -iso_mbr_part_type a2a0d0ebe5b9334487c068b6b72699c7 \
-  -c '/boot/boot.cat' \
-  -b '/boot/grub/i386-pc/eltorito.img' \
-  -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info \
+  -b isolinux/isolinux.bin \
+  -c isolinux/boot.cat \
+  -no-emul-boot -boot-load-size 4 -boot-info-table \
   -eltorito-alt-boot \
-  -e '--interval:appended_partition_2:::' \
+  -e boot/grub/efi.img \
   -no-emul-boot \
+  -isohybrid-gpt-basdat \
   -o "$OUTPUT_ISO" \
   . 2>&1 | tail -5
 
diff --git a/iso-output/debian-netinst.iso b/iso-output/debian-netinst.iso
new file mode 100644
index 0000000..07146b7
Binary files /dev/null and b/iso-output/debian-netinst.iso differ
diff --git a/iso-output/seniornet-kiosk.iso b/iso-output/seniornet-kiosk.iso
new file mode 100644
index 0000000..a8f21b5
Binary files /dev/null and b/iso-output/seniornet-kiosk.iso differ