diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml
index f88eb0c8..87df98e3 100644
--- a/.github/workflows/electron-build.yml
+++ b/.github/workflows/electron-build.yml
@@ -169,17 +169,11 @@ jobs:
           echo "Imported certificates:"
           security find-identity -v -p codesigning $KEYCHAIN_PATH
 
-      - name: Set version for build
-        if: steps.check_certs.outputs.has_certs == 'true'
-        run: |
-          # Auto-increment patch version based on run number
-          npm version 1.8.${{ github.run_number }} --no-git-tag-version
-          cat package.json | grep version
-
       - name: Build macOS App Store Package
         if: steps.check_certs.outputs.has_certs == 'true'
         env:
           ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES: true
+          BUILD_NUMBER: ${{ github.run_number }}
         run: npm run build:mac
 
       - name: List release directory
diff --git a/electron-builder.json b/electron-builder.json
index 69ea20c9..571b9980 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -64,7 +64,7 @@
     "target": [
       {
         "target": "mas",
-        "arch": ["x64", "arm64"]
+        "arch": "universal"
       }
     ],
     "icon": "public/icon.icns",
@@ -77,6 +77,7 @@
     "minimumSystemVersion": "10.15"
   },
   "mas": {
+    "bundleVersion": "${env.BUILD_NUMBER}",
     "provisioningProfile": "build/Termix_Mac_App_Store.provisionprofile",
     "entitlements": "build/entitlements.mas.plist",
     "entitlementsInherit": "build/entitlements.mas.inherit.plist",