diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a26d8fd4..db8eabc0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,6 +65,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+        - os: macos-13-xlarge
+          suffix: mac
+          arch: arm64
+          extension: dmg
+          latestMetadataName: latest-mac-arm64.yml
+
         - os: macos-13
           suffix: mac
           arch: x64
@@ -143,7 +149,7 @@ jobs:
         with:
           name: Cockpit-${{ matrix.suffix }}-${{ matrix.arch }}-${{ env.VERSION }}.zip
           path: dist/Cockpit*.zip
-          if-no-files-found: error
+          if-no-files-found: ignore
 
       - name: Upload latest metadata artifact
         uses: actions/upload-artifact@v4
diff --git a/package.json b/package.json
index f8674b64a..af9e0a106 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,17 @@
   },
   "build": {
     "files": [
-      "dist"
+      "dist/**/*",
+      "!dist/**/*.map",
+      "!dist/**/*.d.ts",
+      "!dist/**/*.js.map"
+    ],
+    "directories": {
+      "buildResources": "public"
+    },
+    "asar": true,
+    "asarUnpack": [
+      "node_modules/**/*.node"
     ],
     "appId": "org.bluerobotics.cockpit",
     "productName": "Cockpit",
@@ -131,8 +141,21 @@
     },
     "artifactName": "${productName}-${os}-${arch}-${version}.${ext}",
     "mac": {
+      "target": [
+        {
+          "target": "dmg",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        }
+      ],
       "category": "public.app-category.utilities",
-      "icon": "public/pwa-512x512.png"
+      "icon": "public/pwa-512x512.png",
+      "hardenedRuntime": true,
+      "gatekeeperAssess": false,
+      "entitlements": "build/entitlements.mac.plist",
+      "entitlementsInherit": "build/entitlements.mac.plist"
     },
     "win": {
       "icon": "public/pwa-512x512.png"