diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f25154d600..d00b317ed3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,6 +74,9 @@ jobs:
 
     - run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.js
 
+    # Work around electron-builder beta bug
+    - run: ln -s ../../node_modules/electron app/node_modules
+
     - name: Build and sign packages
       run: scripts/build-macos.js
       if: github.repository == 'Eugeny/tabby' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags'))
diff --git a/scripts/build-macos.js b/scripts/build-macos.js
index e7e319a4c9..eaaecbfc82 100755
--- a/scripts/build-macos.js
+++ b/scripts/build-macos.js
@@ -16,6 +16,7 @@ if (process.env.GITHUB_HEAD_REF) {
 builder({
     dir: true,
     mac: ['pkg', 'zip'],
+    x64: process.env.ARCH === 'x86_64',
     arm64: process.env.ARCH === 'arm64',
     config: {
         extraMetadata: {
diff --git a/scripts/prepackage-plugins.js b/scripts/prepackage-plugins.js
index 7696faaed0..bf579f411d 100755
--- a/scripts/prepackage-plugins.js
+++ b/scripts/prepackage-plugins.js
@@ -28,6 +28,7 @@ vars.builtinPlugins.forEach(plugin => {
             electronVersion: vars.electronVersion,
             arch: process.env.ARCH ?? process.arch,
             force: true,
+            useCache: false,
         })
     }
     sh.cd('..')