diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index dcd63f492..8b71dcf7b 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -175,9 +175,9 @@ jobs:
       - name: Install attr
         run: sudo apt-get install -y attr
       
-      - name: Install genisoimage and libdmg-hfsplus
+      - name: Install xorriso and libdmg-hfsplus
         run: |
-          sudo apt-get install -y genisoimage cmake
+          sudo apt-get install -y xorriso cmake
           git clone https://github.com/mozilla/libdmg-hfsplus.git
           cd libdmg-hfsplus && cmake . && make && cd ..
           sudo mv libdmg-hfsplus/dmg/dmg /usr/local/bin/dmg
diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh
index 212d5a8cb..3175efb25 100755
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -147,9 +147,13 @@ UNCOMPRESSED_DMG="$OUTPUT_DIRECTORY/UNCOMPRESSED_$RELEASE_DMG_FILE_NAME"
 COMPRESSED_DMG="$OUTPUT_DIRECTORY/$RELEASE_DMG_FILE_NAME"
 
 dd if=/dev/zero of="$UNCOMPRESSED_DMG" bs=1M count=100
-genisoimage -D -V "Ryujinx" \
--no-pad -apple -uid 0 -gid 0 -dir-mode 0755 -file-mode 0755 \
--o "$UNCOMPRESSED_DMG" "$DMG_FOLDER"
+xorriso -outdev "$UNCOMPRESSED_DMG" \
+  -volid "Ryujinx" \
+  -padding 0 \
+  -hfsplus on \
+  -map "$DMG_FOLDER" / \
+  -chmod_r 0755 / -- \
+  -chown_r 0 0 / -- \
 dmg dmg -c lzma "$UNCOMPRESSED_DMG" "$COMPRESSED_DMG"
 rm -r "$DMG_FOLDER"
 rm -f "$UNCOMPRESSED_DMG"
diff --git a/distribution/macos/create_macos_pr_build_ava.sh b/distribution/macos/create_macos_pr_build_ava.sh
index 556278a5c..4f942ac26 100644
--- a/distribution/macos/create_macos_pr_build_ava.sh
+++ b/distribution/macos/create_macos_pr_build_ava.sh
@@ -143,9 +143,13 @@ UNCOMPRESSED_DMG="$OUTPUT_DIRECTORY/UNCOMPRESSED_$RELEASE_DMG_FILE_NAME"
 COMPRESSED_DMG="$OUTPUT_DIRECTORY/$RELEASE_DMG_FILE_NAME"
 
 dd if=/dev/zero of="$UNCOMPRESSED_DMG" bs=1M count=100
-genisoimage -D -V "Ryujinx" \
--no-pad -apple -uid 0 -gid 0 -dir-mode 0755 -file-mode 0755 \
--o "$UNCOMPRESSED_DMG" "$DMG_FOLDER"
+xorriso -outdev "$UNCOMPRESSED_DMG" \
+  -volid "Ryujinx" \
+  -padding 0 \
+  -hfsplus on \
+  -map "$DMG_FOLDER" / \
+  -chmod_r 0755 / -- \
+  -chown_r 0 0 / -- \
 dmg dmg -c lzma "$UNCOMPRESSED_DMG" "$COMPRESSED_DMG"
 rm -r "$DMG_FOLDER"
 rm -f "$UNCOMPRESSED_DMG"