diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 451fdabe5..2b0c902e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -237,7 +237,7 @@ jobs:
           ninja
 
   # MacOS build
-  macos:
+  macos-x86:
     runs-on: macos-13
 
     permissions:
@@ -370,19 +370,12 @@ jobs:
 
     - name: 📦 Create DMG
       run: |
-        set -x
-        mkdir bundle
-        mv build/install/ImHex.app bundle
-        cd bundle
-        ln -s /Applications Applications
-        cd ..
-        for i in $(seq 1 10); do
-            if hdiutil create -volname "ImHex" -srcfolder bundle -ov -format UDZO imhex-${{ env.IMHEX_VERSION }}-macOS${{ matrix.suffix }}-x86_64.dmg; then
-                echo "Created dmg after ${i} attempts"
-                break
-            fi
-            sleep 10
-        done
+        git clone https://github.com/sindresorhus/create-dmg
+        cd create-dmg
+        npm i
+        cd ../build/install
+        create-dmg ImHex.app
+        mv *.dmg ../../imhex-${{ env.IMHEX_VERSION }}-macOS${{ matrix.suffix }}-x86_64.dmg
 
     - name: 🗝️ Generate build provenance attestations
       uses: actions/attest-build-provenance@v2
@@ -398,7 +391,7 @@ jobs:
         name: macOS DMG${{ matrix.suffix }} x86_64
         path: ./*.dmg
 
-  macos-arm64-build:
+  macos-arm64:
     runs-on: ubuntu-24.04
     name: 🍎 macOS 13 arm64
 
@@ -447,7 +440,7 @@ jobs:
   macos-arm64-package:
     runs-on: macos-13
     name: 🍎 macOS 13 arm64 Packaging
-    needs: macos-arm64-build
+    needs: macos-arm64
 
     env:
       IMHEX_VERSION: ${{ needs.macos-arm64-build.outputs.IMHEX_VERSION }}
@@ -490,19 +483,12 @@ jobs:
 
       - name: 📦 Create DMG
         run: |
-          set -x
-          mkdir bundle
-          mv out/ImHex.app bundle
-          cd bundle
-          ln -s /Applications Applications
-          cd ..
-          for i in $(seq 1 10); do
-              if hdiutil create -volname "ImHex" -srcfolder bundle -ov -format UDZO imhex-${{ env.IMHEX_VERSION }}-macOS-arm64.dmg; then
-                  echo "Created dmg after ${i} attempts"
-                  break
-              fi
-              sleep 10
-          done
+          git clone https://github.com/sindresorhus/create-dmg
+          cd create-dmg
+          npm i
+          cd ../build/install
+          create-dmg ImHex.app
+          mv *.dmg ../../imhex-${{ env.IMHEX_VERSION }}-macOS${{ matrix.suffix }}-arm64.dmg
 
       - name: 🗝️ Generate build provenance attestations
         uses: actions/attest-build-provenance@v2