diff --git a/usr/bin/archboot-allinone.sh b/usr/bin/archboot-allinone.sh
index a082edd65..42e579472 100755
--- a/usr/bin/archboot-allinone.sh
+++ b/usr/bin/archboot-allinone.sh
@@ -436,17 +436,14 @@ cd "${WD}/"
 ## Generate the BIOS+ISOHYBRID CD image using xorriso (extra/libisoburn package) in mkisofs emulation mode
 echo "Generating ALLINONE hybrid ISO ..."
 xorriso -as mkisofs \
-        -iso-level 3 -rock -joliet \
-        -max-iso9660-filenames -omit-period \
-        -omit-version-number -allow-leading-dots \
-        -relaxed-filenames -allow-lowercase -allow-multidot \
+        -iso-level 3 \
+        -max-iso9660-filenames \
         -volid "ARCHBOOT" \
         -preparer "prepared by ${_BASENAME}" \
         -eltorito-boot boot/syslinux/isolinux.bin \
         -eltorito-catalog boot/syslinux/boot.cat \
         -no-emul-boot -boot-load-size 4 -boot-info-table \
         -isohybrid-mbr /usr/lib/syslinux/bios/isohdpfx.bin \
-        --sort-weight 1 boot/syslinux/isolinux.bin \
         -output "${IMAGENAME}.iso" "${ALLINONE}/" &> "/tmp/archboot_allinone_xorriso.log"
 
 # create x86_64 iso, if not present
diff --git a/usr/bin/archboot-uefi-cd.sh b/usr/bin/archboot-uefi-cd.sh
index 01e514321..1f98a5aee 100755
--- a/usr/bin/archboot-uefi-cd.sh
+++ b/usr/bin/archboot-uefi-cd.sh
@@ -89,10 +89,8 @@ rm -rf "${FSIMG}"
 
 ## Create new ISO with BIOS, ISOHYBRID and UEFI support
 xorriso -as mkisofs \
-        -iso-level 3 -rock -joliet \
-        -max-iso9660-filenames -omit-period \
-        -omit-version-number -allow-leading-dots \
-        -relaxed-filenames -allow-lowercase -allow-multidot \
+        -iso-level 3 \
+        -full-iso9660-filenames \
         -volid "ARCHBOOT" \
         -preparer "prepared by archboot-uefi-cd.sh" \
         -eltorito-boot boot/syslinux/isolinux.bin \
@@ -101,7 +99,6 @@ xorriso -as mkisofs \
         -eltorito-alt-boot -e CDEFI/cdefiboot.img -isohybrid-gpt-basdat \
         -no-emul-boot \
         -isohybrid-mbr "${ISOIMG}"/boot/syslinux/isohdpfx.bin \
-        --sort-weight 1 boot/syslinux/isolinux.bin \
         -output "${OUTPUT_IMAGENAME}" "${ISOIMG}"/ &> /tmp/xorriso.log
 
 if [[ -e "${OUTPUT_IMAGENAME}" ]]; then
diff --git a/usr/bin/archboot-update-iso.sh b/usr/bin/archboot-update-iso.sh
index 8a35c1ad4..c0cfa513d 100755
--- a/usr/bin/archboot-update-iso.sh
+++ b/usr/bin/archboot-update-iso.sh
@@ -698,10 +698,8 @@ cd "${_ARCHBOOT_ISO_WD}/"
 echo "Generating the modified ISO ..."
 
 xorriso -as mkisofs \
-	-iso-level 3 -rock -joliet \
-	-max-iso9660-filenames -omit-period \
-	-omit-version-number -allow-leading-dots \
-	-relaxed-filenames -allow-lowercase -allow-multidot \
+	-iso-level 3 \
+	-full-iso9660-filenames \
 	-volid "ARCHBOOT" \
 	-preparer "prepared by ${_BASENAME}" \
 	-eltorito-boot boot/syslinux/isolinux.bin \
@@ -709,7 +707,6 @@ xorriso -as mkisofs \
 	-no-emul-boot -boot-load-size 4 -boot-info-table \
 	-isohybrid-mbr /usr/lib/syslinux/bios/isohdpfx.bin \
 	${_CD_UEFI_PARAMETERS} \
-	--sort-weight 1 boot/syslinux/isolinux.bin \
 	-output "${_ARCHBOOT_ISO_UPDATED_PATH}" "${_ARCHBOOT_ISO_EXT_DIR}/" &> "/tmp/archboot_update_xorriso.log"
 echo