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..180186307
Binary files /dev/null and b/bin/better-sqlite3/linux-desktop-better_sqlite3.node differ
diff --git a/bin/better-sqlite3/linux-server-better_sqlite3.node b/bin/better-sqlite3/linux-server-better_sqlite3.node
new file mode 100644
index 000000000..ca173a3c6
Binary files /dev/null and b/bin/better-sqlite3/linux-server-better_sqlite3.node differ
diff --git a/bin/better-sqlite3/mac-arm64-better_sqlite3.node b/bin/better-sqlite3/mac-arm64-better_sqlite3.node
new file mode 100644
index 000000000..9709dcd23
Binary files /dev/null and b/bin/better-sqlite3/mac-arm64-better_sqlite3.node differ
diff --git a/bin/better-sqlite3/mac-x64-better_sqlite3.node b/bin/better-sqlite3/mac-x64-better_sqlite3.node
new file mode 100644
index 000000000..70835a3f8
Binary files /dev/null and b/bin/better-sqlite3/mac-x64-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..b5ced20b5
Binary files /dev/null and b/bin/better-sqlite3/win-better_sqlite3.node differ
diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh
index 16c44f43a..e3e415355 100755
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -26,6 +26,9 @@ SRC_DIR=./dist/trilium-linux-x64-src
rm -r "$SRC_DIR"/src/public/app-dist/*.mobile.*
+echo "Copying required linux-x64 binaries"
+cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node "$SRC_DIR"/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+
echo "Packaging linux x64 electron build"
./node_modules/.bin/electron-packager "$SRC_DIR" --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
diff --git a/bin/build-mac-arm64.sh b/bin/build-mac-arm64.sh
index c1fcb295e..8d1f595a6 100755
--- a/bin/build-mac-arm64.sh
+++ b/bin/build-mac-arm64.sh
@@ -7,6 +7,10 @@ then
./bin/copy-trilium.sh $SRC_DIR
fi
+echo "Copying required mac arm64 binaries"
+
+cp -r bin/better-sqlite3/mac-arm64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
echo "Packaging mac arm64 electron build"
diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh
index f665f9b73..8e560ba41 100755
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@@ -9,6 +9,8 @@ fi
echo "Copying required mac x64 binaries"
+cp -r bin/better-sqlite3/mac-x64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+
rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
echo "Packaging mac x64 electron build"
diff --git a/bin/build-server.sh b/bin/build-server.sh
index 260f309ca..94a3650ef 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -23,6 +23,8 @@ rm -r $PKG_DIR/node_modules/electron*
rm -r $PKG_DIR/webpack*
rm -r $PKG_DIR/electron.js
+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
diff --git a/bin/build-win-x64.sh b/bin/build-win-x64.sh
index 33f3b06be..ad359ccb6 100755
--- a/bin/build-win-x64.sh
+++ b/bin/build-win-x64.sh
@@ -12,6 +12,10 @@ then
./bin/copy-trilium.sh $SRC_DIR
fi
+echo "Copying required windows binaries"
+
+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.*
echo "Packaging windows x64 electron build"
diff --git a/trilium.iml b/trilium.iml
index 8172d5ec5..bfa02661b 100644
--- a/trilium.iml
+++ b/trilium.iml
@@ -12,6 +12,7 @@
+