diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4fdb970..dbc8d7f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,6 +44,9 @@ jobs:
       - name: Build Lens
         run: |
           npm run all:install
+          # Avoid npm install from electron-builder
+          # ref: https://github.com/electron-userland/electron-builder/blob/80a3ae857b9305aff1774e1b2b932601af50231b/packages/app-builder-lib/src/util/yarn.ts#L11-L16
+          mkdir -p open-lens/node_modules
           
           if [ "${CSC_LINK}" = "" ] || [ "${CSC_KEY_PASSWORD}" = "" ]; then
             unset CSC_LINK
@@ -54,6 +57,13 @@ jobs:
             npx nx run open-lens:build:app --win nsis msi portable
           elif [ "$RUNNER_OS" == "Linux" ]; then
             npx nx run open-lens:build:app --x64 --arm64
+            rm -rf node_modules
+            npm run all:install -- --arch=arm64
+            find . -name '*pty.node' -print0 | xargs -0 file
+            env npm_config_target_arch=arm64 npm_config_arch=arm64 npm rebuild --verbose node-pty@0.10.1
+            find . -name '*pty.node' -print0 | xargs -0 file
+            npx nx reset
+            npx nx run open-lens:build:app 
             find . -name '*pty.node' -print0 | xargs -0 file
           else
             npx nx run open-lens:build:app --x64 --arm64
@@ -75,7 +85,7 @@ jobs:
           WIN_CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD_WIN }}
           CSC_FOR_PULL_REQUEST: true
           DOWNLOAD_ALL_ARCHITECTURES: ${{ runner.os != 'Windows' }}
-          DEBUG: electron-rebuild
+
       - name: Calculate SHA256 checksum
         run: |-
           if command -v shasum 2>/dev/null 1>&2; then
diff --git a/update.js b/update.js
index e10a6d7..acdd890 100644
--- a/update.js
+++ b/update.js
@@ -9,9 +9,9 @@ packageJsonOpenLens.build.publish = [{
 }];
 
 packageJsonOpenLens.version = `${packageJsonOpenLens.version}-${process.env.BUILD_ID}`;
-packageJsonOpenLens.build.npmRebuild = true;
+packageJsonOpenLens.build.npmRebuild = os.platform() === 'darwin';
 packageJsonOpenLens.build.detectUpdateChannel = false;
-packageJsonOpenLens.devDependencies["electron-builder"] = "^24.4.0"
+packageJsonOpenLens.devDependencies["electron-builder"] = "^24.6.0"
 
 delete packageJsonOpenLens.scripts.postinstall;