diff --git a/bin/better-sqlite3/linux-better_sqlite3.node b/bin/better-sqlite3/linux-better_sqlite3.node
old mode 100755
new mode 100644
index c92d64e24..a4289675c
Binary files a/bin/better-sqlite3/linux-better_sqlite3.node and b/bin/better-sqlite3/linux-better_sqlite3.node differ
diff --git a/bin/better-sqlite3/mac-better_sqlite3.node b/bin/better-sqlite3/mac-better_sqlite3.node
new file mode 100644
index 000000000..ab3b275b3
Binary files /dev/null and b/bin/better-sqlite3/mac-better_sqlite3.node differ
diff --git a/bin/better-sqlite3/win-better-sqlite3.node b/bin/better-sqlite3/win-better-sqlite3.node
new file mode 100644
index 000000000..4167c159f
Binary files /dev/null and b/bin/better-sqlite3/win-better-sqlite3.node differ
diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh
index b3e864ab2..fbdc230d8 100755
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@@ -9,15 +9,7 @@ fi
 
 echo "Copying required mac binaries"
 
-rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
-rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
-rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
-rm -r $SRC_DIR/node_modules/giflossy/vendor/*
-
-cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
-cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
+cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 
 rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 
diff --git a/bin/build-server.sh b/bin/build-server.sh
index 514c262b9..76b42f667 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -18,9 +18,7 @@ mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
 
 rm -r $PKG_DIR/node_modules/electron*
 
-rm -r $PKG_DIR/node_modules/sqlite3/lib/binding/*
-
-cp -r ./bin/deps/linux-x64/sqlite/node* $PKG_DIR/node_modules/sqlite3/lib/binding/
+cp -r bin/better-sqlite3/linux-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 
 printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
 chmod 755 $PKG_DIR/trilium.sh
diff --git a/bin/build-win-x64.sh b/bin/build-win-x64.sh
index ae92e0e85..98717f8a8 100755
--- a/bin/build-win-x64.sh
+++ b/bin/build-win-x64.sh
@@ -9,15 +9,7 @@ fi
 
 echo "Copying required windows binaries"
 
-rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
-rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
-rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
-rm -r $SRC_DIR/node_modules/giflossy/vendor/*
-
-cp -r bin/deps/win-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
-cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
+cp -r bin/better-sqlite3/win-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 
 rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 
diff --git a/package-lock.json b/package-lock.json
index 597eb0683..8e5b0897a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3053,9 +3053,9 @@
       }
     },
     "electron": {
-      "version": "10.0.0-beta.25",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0-beta.25.tgz",
-      "integrity": "sha512-AWtK3dVaIXlGp1S7a7KNcLEBSp48K4GXYCQC0Wp6dUovKP47BsxxV0i6lTrKU8cXVAEHuwAL5Mz4O/mmOlklRA==",
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-9.2.1.tgz",
+      "integrity": "sha512-ZsetaQjXB8+9/EFW1FnfK4ukpkwXCxMEaiKiUZhZ0ZLFlLnFCpe0Bg4vdDf7e4boWGcnlgN1jAJpBw7w0eXuqA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index d9df5ac3d..5ce456e50 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.2",
-    "electron": "10.0.0-beta.25",
+    "electron": "9.2.1",
     "electron-builder": "22.8.0",
     "electron-packager": "15.1.0",
     "electron-rebuild": "2.0.0",