diff --git a/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip b/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip
new file mode 100644
index 000000000..ea6512cce
Binary files /dev/null and b/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip differ
diff --git a/.yarn/cache/electron-rebuild-npm-3.2.9-4a5b3274c9-d72bd02884.zip b/.yarn/cache/electron-rebuild-npm-3.2.9-4a5b3274c9-d72bd02884.zip
deleted file mode 100644
index ff26b0ab8..000000000
Binary files a/.yarn/cache/electron-rebuild-npm-3.2.9-4a5b3274c9-d72bd02884.zip and /dev/null differ
diff --git a/.yarn/cache/lzma-native-npm-8.0.6-f888bace67-cbe782fd53.zip b/.yarn/cache/lzma-native-npm-8.0.6-f888bace67-cbe782fd53.zip
deleted file mode 100644
index 7fcf50924..000000000
Binary files a/.yarn/cache/lzma-native-npm-8.0.6-f888bace67-cbe782fd53.zip and /dev/null differ
diff --git a/.yarn/cache/node-abi-npm-3.51.0-7cb12efc40-3fabc9d58f.zip b/.yarn/cache/node-abi-npm-3.65.0-d35ff0f835-5a60f2b0c7.zip
similarity index 70%
rename from .yarn/cache/node-abi-npm-3.51.0-7cb12efc40-3fabc9d58f.zip
rename to .yarn/cache/node-abi-npm-3.65.0-d35ff0f835-5a60f2b0c7.zip
index bf7e97eae..576875721 100644
Binary files a/.yarn/cache/node-abi-npm-3.51.0-7cb12efc40-3fabc9d58f.zip and b/.yarn/cache/node-abi-npm-3.65.0-d35ff0f835-5a60f2b0c7.zip differ
diff --git a/.yarn/cache/node-addon-api-npm-3.2.1-a29528f81d-2369986bb0.zip b/.yarn/cache/node-addon-api-npm-3.2.1-a29528f81d-2369986bb0.zip
deleted file mode 100644
index 038beb4ad..000000000
Binary files a/.yarn/cache/node-addon-api-npm-3.2.1-a29528f81d-2369986bb0.zip and /dev/null differ
diff --git a/.yarn/cache/node-api-version-npm-0.1.4-5f4c17673c-e652a9502a.zip b/.yarn/cache/node-api-version-npm-0.1.4-5f4c17673c-e652a9502a.zip
deleted file mode 100644
index 9d9b570a9..000000000
Binary files a/.yarn/cache/node-api-version-npm-0.1.4-5f4c17673c-e652a9502a.zip and /dev/null differ
diff --git a/.yarn/cache/node-api-version-npm-0.2.0-7297725ba8-26146d0d4a.zip b/.yarn/cache/node-api-version-npm-0.2.0-7297725ba8-26146d0d4a.zip
new file mode 100644
index 000000000..d1cc45a95
Binary files /dev/null and b/.yarn/cache/node-api-version-npm-0.2.0-7297725ba8-26146d0d4a.zip differ
diff --git a/.yarn/cache/node-gyp-build-npm-4.7.1-8824d23d05-2ef8248021.zip b/.yarn/cache/node-gyp-build-npm-4.7.1-8824d23d05-2ef8248021.zip
deleted file mode 100644
index 9e5ed8aef..000000000
Binary files a/.yarn/cache/node-gyp-build-npm-4.7.1-8824d23d05-2ef8248021.zip and /dev/null differ
diff --git a/.yarn/cache/read-binary-file-arch-npm-1.0.6-78d06381e2-7a25894816.zip b/.yarn/cache/read-binary-file-arch-npm-1.0.6-78d06381e2-7a25894816.zip
new file mode 100644
index 000000000..553464058
Binary files /dev/null and b/.yarn/cache/read-binary-file-arch-npm-1.0.6-78d06381e2-7a25894816.zip differ
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 531bb817c..650738055 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -55,6 +55,7 @@
     "@babel/core": "*",
     "@babel/preset-env": "*",
     "@electron/notarize": "^2.1.0",
+    "@electron/rebuild": "^3.6.0",
     "@types/fs-extra": "^11.0.1",
     "@types/lodash": "^4.14.189",
     "@types/mime-types": "^2.1.1",
@@ -65,7 +66,6 @@
     "babel-loader": "^9.1.0",
     "copy-webpack-plugin": "^11.0.0",
     "electron-builder": "^24.9.1",
-    "electron-rebuild": "^3.2.9",
     "eslint": "*",
     "eslint-config-prettier": "^8.9.0",
     "eslint-plugin-import": "^2.26.0",
diff --git a/yarn.lock b/yarn.lock
index 028e88400..56072880c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3023,6 +3023,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@electron/rebuild@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "@electron/rebuild@npm:3.6.0"
+  dependencies:
+    "@malept/cross-spawn-promise": ^2.0.0
+    chalk: ^4.0.0
+    debug: ^4.1.1
+    detect-libc: ^2.0.1
+    fs-extra: ^10.0.0
+    got: ^11.7.0
+    node-abi: ^3.45.0
+    node-api-version: ^0.2.0
+    node-gyp: ^9.0.0
+    ora: ^5.1.0
+    read-binary-file-arch: ^1.0.6
+    semver: ^7.3.5
+    tar: ^6.0.5
+    yargs: ^17.0.1
+  bin:
+    electron-rebuild: lib/cli.js
+  checksum: 0dbf320b71ba5bc31ff7e0f46b157a16d56a7ee2b2d503ad60b46fe4673f9ba63c5b270a00e44856564e6a9fd5da216034a26eb3321679c40b681156ab6289a2
+  languageName: node
+  linkType: hard
+
 "@electron/remote@npm:^2.1.2":
   version: 2.1.2
   resolution: "@electron/remote@npm:2.1.2"
@@ -6909,6 +6933,7 @@ __metadata:
     "@babel/core": "*"
     "@babel/preset-env": "*"
     "@electron/notarize": ^2.1.0
+    "@electron/rebuild": ^3.6.0
     "@electron/remote": ^2.1.2
     "@standardnotes/domain-core": ^1.40.0
     "@standardnotes/electron-clear-data": 1.1.1
@@ -6929,7 +6954,6 @@ __metadata:
     electron: 31.1.0
     electron-builder: ^24.9.1
     electron-log: ^4.4.8
-    electron-rebuild: ^3.2.9
     electron-updater: ^6.1.4
     eslint: "*"
     eslint-config-prettier: ^8.9.0
@@ -13582,30 +13606,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-rebuild@npm:^3.2.9":
-  version: 3.2.9
-  resolution: "electron-rebuild@npm:3.2.9"
-  dependencies:
-    "@malept/cross-spawn-promise": ^2.0.0
-    chalk: ^4.0.0
-    debug: ^4.1.1
-    detect-libc: ^2.0.1
-    fs-extra: ^10.0.0
-    got: ^11.7.0
-    lzma-native: ^8.0.5
-    node-abi: ^3.0.0
-    node-api-version: ^0.1.4
-    node-gyp: ^9.0.0
-    ora: ^5.1.0
-    semver: ^7.3.5
-    tar: ^6.0.5
-    yargs: ^17.0.1
-  bin:
-    electron-rebuild: lib/src/cli.js
-  checksum: d72bd028849c84d0daa009765197d5afd4a643521f5f05fedfec9720923985eb474acdeed44f906f1224ced315075d715553a64dc593d78c83d1bc2b94e78cca
-  languageName: node
-  linkType: hard
-
 "electron-to-chromium@npm:^1.4.431":
   version: 1.4.474
   resolution: "electron-to-chromium@npm:1.4.474"
@@ -19341,20 +19341,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lzma-native@npm:^8.0.5":
-  version: 8.0.6
-  resolution: "lzma-native@npm:8.0.6"
-  dependencies:
-    node-addon-api: ^3.1.0
-    node-gyp: latest
-    node-gyp-build: ^4.2.1
-    readable-stream: ^3.6.0
-  bin:
-    lzmajs: bin/lzmajs
-  checksum: cbe782fd53309163a9362d0b5a960051936268a891779d26fdfe42085ce7fa309dc96e91414fe64ddd2bde2e2c25fc18e1d89aa6a2691557dd89b6582840a979
-  languageName: node
-  linkType: hard
-
 "make-dir@npm:^2.0.0, make-dir@npm:^2.1.0":
   version: 2.1.0
   resolution: "make-dir@npm:2.1.0"
@@ -20669,15 +20655,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-abi@npm:^3.0.0":
-  version: 3.51.0
-  resolution: "node-abi@npm:3.51.0"
-  dependencies:
-    semver: ^7.3.5
-  checksum: 3fabc9d58f0478767157560249f79c4a9e95082b96700cd8cc470f517bd566dbab82a37c862db3f78d3187be9f19f5cd9822b6f1b7ac7a3254fa70c3e3b38a83
-  languageName: node
-  linkType: hard
-
 "node-abi@npm:^3.3.0":
   version: 3.45.0
   resolution: "node-abi@npm:3.45.0"
@@ -20687,6 +20664,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-abi@npm:^3.45.0":
+  version: 3.65.0
+  resolution: "node-abi@npm:3.65.0"
+  dependencies:
+    semver: ^7.3.5
+  checksum: 5a60f2b0c73fe0a1123e581bd99e43729f4aa3f4b9b19f1915567128d52540e8f812474410a446cd77d708a3a1139e0b2abf1d0823ba6b5f5d47aa4345931706
+  languageName: node
+  linkType: hard
+
 "node-abort-controller@npm:^3.1.1":
   version: 3.1.1
   resolution: "node-abort-controller@npm:3.1.1"
@@ -20703,15 +20689,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-addon-api@npm:^3.1.0":
-  version: 3.2.1
-  resolution: "node-addon-api@npm:3.2.1"
-  dependencies:
-    node-gyp: latest
-  checksum: 2369986bb0881ccd9ef6bacdf39550e07e089a9c8ede1cbc5fc7712d8e2faa4d50da0e487e333d4125f8c7a616c730131d1091676c9d499af1d74560756b4a18
-  languageName: node
-  linkType: hard
-
 "node-addon-api@npm:^4.2.0, node-addon-api@npm:^4.3.0":
   version: 4.3.0
   resolution: "node-addon-api@npm:4.3.0"
@@ -20730,12 +20707,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-api-version@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "node-api-version@npm:0.1.4"
+"node-api-version@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "node-api-version@npm:0.2.0"
   dependencies:
     semver: ^7.3.5
-  checksum: e652a9502a6b62bda01d6134be30195f9d8b3ba75190a4190c76e7ed4f12a410cdc7ec301f878aff11dafc14bc7d9c4fc81f88c1e174c8fb970b7b33eb978b98
+  checksum: 26146d0d4a6a252009e1926e2f3668a7ab1710d6ee59d615b0099ccdc0c6588a48b5f8668349d4eb313be0d904a67b106b7cf2d2a1a31609ff671394baaf6ce0
   languageName: node
   linkType: hard
 
@@ -20812,17 +20789,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp-build@npm:^4.2.1":
-  version: 4.7.1
-  resolution: "node-gyp-build@npm:4.7.1"
-  bin:
-    node-gyp-build: bin.js
-    node-gyp-build-optional: optional.js
-    node-gyp-build-test: build-test.js
-  checksum: 2ef8248021489db03be3e8098977cdc797b80a9b12b77c6dcb89b0dc89b8c62e6a482672ee298f61021740ae7f080fb33154cfec8fb158cec620f57b0fae87c0
-  languageName: node
-  linkType: hard
-
 "node-gyp-build@npm:^4.4.0":
   version: 4.7.0
   resolution: "node-gyp-build@npm:4.7.0"
@@ -23257,6 +23223,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-binary-file-arch@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "read-binary-file-arch@npm:1.0.6"
+  dependencies:
+    debug: ^4.3.4
+  bin:
+    read-binary-file-arch: cli.js
+  checksum: 7a25894816ff9caf5c27886b0aea1740bfab29483443a2859e5a0dc367c56ee9489f3cdba9da676a6d5913d3e421e71c6afbdbcfb636714ff49d93d152c72ba5
+  languageName: node
+  linkType: hard
+
 "read-cache@npm:^1.0.0":
   version: 1.0.0
   resolution: "read-cache@npm:1.0.0"