diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 8b71dcf7b..f082c289c 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 xorriso and libdmg-hfsplus
+      - name: Install genisoimage and libdmg-hfsplus
         run: |
-          sudo apt-get install -y xorriso cmake
+          sudo apt-get install -y enisoimage 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/DMG_ASSETS/DMG_Structure.tar.gz b/distribution/macos/DMG_ASSETS/DMG_Structure.tar.gz
index 09c57a34e..084d5cbc6 100644
Binary files a/distribution/macos/DMG_ASSETS/DMG_Structure.tar.gz and b/distribution/macos/DMG_ASSETS/DMG_Structure.tar.gz differ
diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh
index 6372b1b4c..2a75ef532 100755
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -117,7 +117,6 @@ mkdir "$DMG_FOLDER"
 
 tar -xzf "$BASE_DIRECTORY/distribution/macos/DMG_ASSETS/DMG_Structure.tar.gz" -C "$DMG_FOLDER" --strip-components=1
 cp -R "$UNIVERSAL_APP_BUNDLE" "$DMG_FOLDER/Ryujinx.app"
-find "$DMG_FOLDER" -type f -name '._*' -delete
 
 # Now sign it.
 echo ""
@@ -147,12 +146,10 @@ echo "Packaging .dmg"
 UNCOMPRESSED_DMG="$OUTPUT_DIRECTORY/UNCOMPRESSED_$RELEASE_DMG_FILE_NAME"
 COMPRESSED_DMG="$OUTPUT_DIRECTORY/$RELEASE_DMG_FILE_NAME"
 
-xorriso -outdev "$UNCOMPRESSED_DMG" \
-  -volid "Ryujinx" \
-  -padding 0 \
-  -hfsplus on \
-  -map "$DMG_FOLDER" / \
-  -chmod_r 0755 / --
+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"
 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 a0945777e..2c391c005 100644
--- a/distribution/macos/create_macos_pr_build_ava.sh
+++ b/distribution/macos/create_macos_pr_build_ava.sh
@@ -113,7 +113,6 @@ mkdir "$DMG_FOLDER"
 
 tar -xzf "$BASE_DIRECTORY/distribution/macos/DMG_ASSETS/DMG_Structure.tar.gz" -C "$DMG_FOLDER" --strip-components=1
 cp -R "$UNIVERSAL_APP_BUNDLE" "$DMG_FOLDER/Ryujinx.app"
-find "$DMG_FOLDER" -type f -name '._*' -delete
 
 # Now sign it.
 echo ""
@@ -143,12 +142,10 @@ echo "Packaging .dmg"
 UNCOMPRESSED_DMG="$OUTPUT_DIRECTORY/UNCOMPRESSED_$RELEASE_DMG_FILE_NAME"
 COMPRESSED_DMG="$OUTPUT_DIRECTORY/$RELEASE_DMG_FILE_NAME"
 
-xorriso -outdev "$UNCOMPRESSED_DMG" \
-  -volid "Ryujinx" \
-  -padding 0 \
-  -hfsplus on \
-  -map "$DMG_FOLDER" / \
-  -chmod_r 0755 / --
+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"
 dmg dmg -c lzma "$UNCOMPRESSED_DMG" "$COMPRESSED_DMG"
 rm -r "$DMG_FOLDER"
 rm -f "$UNCOMPRESSED_DMG"