diff --git a/.github/workflows/build-publish-to-mac-store-on-release.yml b/.github/workflows/build-publish-to-mac-store-on-release.yml
index 2c53beae14a..862a162f67f 100644
--- a/.github/workflows/build-publish-to-mac-store-on-release.yml
+++ b/.github/workflows/build-publish-to-mac-store-on-release.yml
@@ -70,7 +70,7 @@ jobs:
         run: npm run dist:mac:mas:buildOnly
 
       - name: Validate App
-        run: ls app-builds; ls app-builds/mas-arm64; xcrun altool --type macos --validate-app -f app-builds/mas-arm64/Super*.pkg -u ${{secrets.APPLEID}} -p ${{secrets.APPLEIDPASS}}
+        run: ls app-builds; ls app-builds/mas; xcrun altool --type macos --validate-app -f app-builds/mas/Super*.pkg -u ${{secrets.APPLEID}} -p ${{secrets.APPLEIDPASS}}
         env:
           APPLEID: ${{secrets.APPLEID}}
           APPLEIDPASS: ${{secrets.APPLEIDPASS}}
diff --git a/build/electron-builder.mas.yaml b/build/electron-builder.mas.yaml
index 642a4e3de8b..fdb41903f23 100644
--- a/build/electron-builder.mas.yaml
+++ b/build/electron-builder.mas.yaml
@@ -17,7 +17,9 @@ mas:
   gatekeeperAssess: false
   darkModeSupport: true
   target:
-    - mas
+    - target: mas
+      arch:
+        - universal
 
   hardenedRuntime: false
   entitlements: build/entitlements.mas.plist
diff --git a/electron-builder.yaml b/electron-builder.yaml
index bcec5decabe..281cfd72da6 100644
--- a/electron-builder.yaml
+++ b/electron-builder.yaml
@@ -58,7 +58,6 @@ snap:
   confinement: strict
 
 mac:
-  notarize: true
   appId: com.super-productivity.app
   type: distribution
   category: public.app-category.productivity
@@ -69,6 +68,7 @@ mac:
   gatekeeperAssess: false
   provisioningProfile: embedded.provisionprofile
   darkModeSupport: true
+  notarize: true
   extendInfo:
     ITSAppUsesNonExemptEncryption: false
   publish: