diff --git a/bin/build-linux-ia32.sh b/bin/build-linux-ia32.sh
deleted file mode 100755
index 7782c742b..000000000
--- a/bin/build-linux-ia32.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-BUILD_DIR=./dist/trilium-linux-ia32
-rm -rf $BUILD_DIR
-
-echo "Rebuilding binaries for linux-ia32"
-./node_modules/.bin/electron-rebuild --arch=ia32
-
-./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=linux --arch=ia32 --overwrite
-
-mv "./dist/Trilium Notes-linux-ia32" $BUILD_DIR
-
-rm -r $BUILD_DIR/resources/app/bin/deps
-# removing software WebGL binaries because they are pretty huge and not necessary
-rm -r $BUILD_DIR/swiftshader
-
-echo "Packaging linux ia32 electron distribution..."
-VERSION=`jq -r ".version" package.json`
-7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR
\ No newline at end of file
diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh
index 47fe84a75..f49e7b043 100755
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -11,6 +11,10 @@ echo "Rebuilding binaries for linux-x64"
 
 mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
 
+rm -r "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/*"
+
+cp -r bin/deps/linux-x64/sqlite/electron* "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/"
+
 rm -r $BUILD_DIR/resources/app/bin/deps
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader
diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh
index ad466a0fc..c532341fe 100755
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@@ -14,10 +14,10 @@ MAC_RES_DIR=$BUILD_DIR/Trilium\ Notes.app/Contents/Resources/app
 
 rm -r "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/*"
 
-cp -r bin/deps/mac/sqlite/* "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/"
-cp bin/deps/mac/image/cjpeg "$MAC_RES_DIR/node_modules/mozjpeg/vendor/"
-cp bin/deps/mac/image/pngquant "$MAC_RES_DIR/node_modules/pngquant-bin/vendor/"
-cp bin/deps/mac/image/gifsicle "$MAC_RES_DIR/node_modules/giflossy/vendor/"
+cp -r bin/deps/mac-x64/sqlite/* "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/"
+cp bin/deps/mac-x64/image/cjpeg "$MAC_RES_DIR/node_modules/mozjpeg/vendor/"
+cp bin/deps/mac-x64/image/pngquant "$MAC_RES_DIR/node_modules/pngquant-bin/vendor/"
+cp bin/deps/mac-x64/image/gifsicle "$MAC_RES_DIR/node_modules/giflossy/vendor/"
 
 rm -r "$MAC_RES_DIR/bin/deps"
 
diff --git a/bin/build-server.sh b/bin/build-server.sh
index 3c9eb9ba7..f67089bda 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -24,10 +24,14 @@ cp -r ../../config-sample.ini ./
 
 rm -r ./node_modules/electron*
 
+rm -r ./node_modules/sqlite3/lib/binding/*
+
+cp -r ../../bin/deps/linux-x64/sqlite/node* ./node_modules/sqlite3/lib/binding/
+
 printf "#/bin/sh\n./node/bin/node src/www" > trilium.sh
 chmod 755 trilium.sh
 
 cd ..
 
-VERSION=`jq -r ".version" package.json`
+VERSION=`jq -r ".version" ../../package.json`
 7z a trilium-linux-x64-server-${VERSION}.7z trilium-linux-x64-server
\ No newline at end of file
diff --git a/bin/build-win-x64.sh b/bin/build-win-x64.sh
index c1bdde5eb..4fcd47ef0 100755
--- a/bin/build-win-x64.sh
+++ b/bin/build-win-x64.sh
@@ -11,10 +11,10 @@ echo "Copying required windows binaries"
 
 WIN_RES_DIR=$BUILD_DIR/resources/app
 
-cp -r bin/deps/win/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/win/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/
-cp bin/deps/win/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/win/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/
+cp -r bin/deps/win-x64/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/win-x64/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/win-x64/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/win-x64/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/
 
 rm -r $WIN_RES_DIR/bin/deps
 # removing software WebGL binaries because they are pretty huge and not necessary
diff --git a/bin/build.sh b/bin/build.sh
index 5a39257cf..37339ca49 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -8,8 +8,6 @@ echo "Deleting existing builds"
 
 rm -r dist/*
 
-bin/build-linux-ia32.sh
-
 bin/build-win-x64.sh
 
 bin/build-mac-x64.sh
diff --git a/bin/deps/linux-x64/sqlite/electron-v4.0-linux-x64/node_sqlite3.node b/bin/deps/linux-x64/sqlite/electron-v4.0-linux-x64/node_sqlite3.node
new file mode 100755
index 000000000..3e3c7b745
Binary files /dev/null and b/bin/deps/linux-x64/sqlite/electron-v4.0-linux-x64/node_sqlite3.node differ
diff --git a/bin/deps/linux-x64/sqlite/node-v64-linux-x64/node_sqlite3.node b/bin/deps/linux-x64/sqlite/node-v64-linux-x64/node_sqlite3.node
new file mode 100755
index 000000000..bf91408e4
Binary files /dev/null and b/bin/deps/linux-x64/sqlite/node-v64-linux-x64/node_sqlite3.node differ
diff --git a/bin/deps/mac/image/cjpeg b/bin/deps/mac-x64/image/cjpeg
similarity index 100%
rename from bin/deps/mac/image/cjpeg
rename to bin/deps/mac-x64/image/cjpeg
diff --git a/bin/deps/mac/image/gifsicle b/bin/deps/mac-x64/image/gifsicle
similarity index 100%
rename from bin/deps/mac/image/gifsicle
rename to bin/deps/mac-x64/image/gifsicle
diff --git a/bin/deps/mac/image/pngquant b/bin/deps/mac-x64/image/pngquant
similarity index 100%
rename from bin/deps/mac/image/pngquant
rename to bin/deps/mac-x64/image/pngquant
diff --git a/bin/deps/mac/sqlite/electron-v4.0-darwin-x64/node_sqlite3.node b/bin/deps/mac-x64/sqlite/electron-v4.0-darwin-x64/node_sqlite3.node
similarity index 100%
rename from bin/deps/mac/sqlite/electron-v4.0-darwin-x64/node_sqlite3.node
rename to bin/deps/mac-x64/sqlite/electron-v4.0-darwin-x64/node_sqlite3.node
diff --git a/bin/deps/win/image/cjpeg.exe b/bin/deps/win-x64/image/cjpeg.exe
similarity index 100%
rename from bin/deps/win/image/cjpeg.exe
rename to bin/deps/win-x64/image/cjpeg.exe
diff --git a/bin/deps/win/image/gifsicle.exe b/bin/deps/win-x64/image/gifsicle.exe
similarity index 100%
rename from bin/deps/win/image/gifsicle.exe
rename to bin/deps/win-x64/image/gifsicle.exe
diff --git a/bin/deps/win/image/pngquant.exe b/bin/deps/win-x64/image/pngquant.exe
similarity index 100%
rename from bin/deps/win/image/pngquant.exe
rename to bin/deps/win-x64/image/pngquant.exe
diff --git a/bin/deps/win/sqlite/electron-v4.0-win32-x64/node_sqlite3.node b/bin/deps/win-x64/sqlite/electron-v4.0-win32-x64/node_sqlite3.node
similarity index 100%
rename from bin/deps/win/sqlite/electron-v4.0-win32-x64/node_sqlite3.node
rename to bin/deps/win-x64/sqlite/electron-v4.0-win32-x64/node_sqlite3.node