diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ac5f04..72b5935 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,14 +29,12 @@ jobs:
       - name: Build MacOS
         if: matrix.os == 'macos-latest'
         run: |
-          security create-keychain -p github_actions build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p github_actions build.keychain
-          security set-keychain-settings -t 3600 -u build.keychain
+          export ELECTRON_BUILDER_EXTRA_ARGS="--universal"
           npm run build:mac
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CSC_IDENTITY_AUTO_DISCOVERY: false
+          DEBUG: electron-builder
 
       # Windows Build
       - name: Build Windows
@@ -80,9 +78,10 @@ jobs:
             dist/*.exe
             dist/*.deb
             dist/*.AppImage
-            dist/latest.yml
+            dist/latest*.yml
             dist/latest-mac.yml
             dist/latest-linux.yml
+            dist/*.blockmap
           body: ${{ env.NOTES }}
           draft: false
           prerelease: false
diff --git a/package.json b/package.json
index 2af3f01..38d5e65 100644
--- a/package.json
+++ b/package.json
@@ -95,13 +95,22 @@
         {
           "target": "dmg",
           "arch": [
-            "x64",
-            "arm64"
+            "universal"
           ]
         }
       ],
       "artifactName": "${productName}-${version}-mac-${arch}.${ext}",
-      "darkModeSupport": true
+      "darkModeSupport": true,
+      "hardenedRuntime": false,
+      "gatekeeperAssess": false,
+      "entitlements": "build/entitlements.mac.plist",
+      "entitlementsInherit": "build/entitlements.mac.plist",
+      "notarize": false,
+      "identity": null,
+      "type": "distribution",
+      "binaries": [
+        "Contents/MacOS/AlgerMusicPlayer"
+      ]
     },
     "win": {
       "icon": "resources/favicon.ico",