diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 39b892fe2bf..c6ccdfd7d42 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -31,7 +31,7 @@ on:
 jobs:
   build:
     name: Build - macOS (${{ matrix.arch }})
-    runs-on: macos-latest
+    runs-on: macos-latest-large
     environment: production
 
     strategy:
@@ -96,7 +96,13 @@ jobs:
           STREAMS_URL: ${{ secrets.STREAMS_URL }}
         run: bun run compile:app
 
-      - name: Build Electron app
+      - name: Prepare native modules & resources
+        working-directory: apps/desktop
+        run: |
+          bun run copy:native-modules
+          bun run download:claude
+
+      - name: Build & sign app bundle
         working-directory: apps/desktop
         env:
           CSC_LINK: ${{ secrets.MAC_CERTIFICATE }}
@@ -104,7 +110,11 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        run: bun run package -- --publish never --config ${{ inputs.electron_builder_config }}
+        run: npx electron-builder --dir --arm64 --config ${{ inputs.electron_builder_config }}
+
+      - name: Package (DMG & ZIP)
+        working-directory: apps/desktop
+        run: npx electron-builder --prepackaged "release/mac-arm64/$(ls release/mac-arm64/)" --config ${{ inputs.electron_builder_config }} --publish never
 
       - name: Upload DMG artifact
         uses: actions/upload-artifact@v4