diff --git a/bin/better-sqlite3/linux-desktop-better_sqlite3.node b/bin/better-sqlite3/linux-desktop-better_sqlite3.node
new file mode 100644
index 000000000..b28277744
Binary files /dev/null and b/bin/better-sqlite3/linux-desktop-better_sqlite3.node differ
diff --git a/bin/better-sqlite3/linux-better_sqlite3.node b/bin/better-sqlite3/linux-server-better_sqlite3.node
similarity index 100%
rename from bin/better-sqlite3/linux-better_sqlite3.node
rename to bin/better-sqlite3/linux-server-better_sqlite3.node
diff --git a/bin/better-sqlite3/win-better-sqlite3.node b/bin/better-sqlite3/win-better_sqlite3.node
similarity index 100%
rename from bin/better-sqlite3/win-better-sqlite3.node
rename to bin/better-sqlite3/win-better_sqlite3.node
diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh
index 9e4b85601..97ef3044a 100755
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -11,7 +11,7 @@ rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 
 echo "Copying required linux-x64 binaries"
 
-cp -r bin/better-sqlite3/linux-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 
 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 
diff --git a/bin/build-server.sh b/bin/build-server.sh
index 76b42f667..5e0407e67 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -16,9 +16,11 @@ cd ..
 
 mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
 
+rm -r $PKG_DIR/node/lib/node_modules/npm
+
 rm -r $PKG_DIR/node_modules/electron*
 
-cp -r bin/better-sqlite3/linux-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_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