diff --git a/bin/build-server.sh b/bin/build-server.sh
index 17a50929b..905aeaf37 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -37,8 +37,8 @@ fi
 # Debug output
 echo "Node filename: $NODE_FILENAME"
 
-PKG_DIR=dist/trilium-linux-${ARCH}-server
-echo "Package directory: $PKG_DIR"
+BUILD_DIR="./build"
+DIST_DIR="./dist"
 
 if [ "$1" != "DONTCOPY" ]
 then
@@ -46,29 +46,30 @@ then
     ./bin/copy-trilium.sh
 fi
 
-cd dist
+cd $BUILD_DIR
 wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_FILENAME}.tar.xz
 tar xfJ node-v${NODE_VERSION}-linux-${NODE_FILENAME}.tar.xz
 rm node-v${NODE_VERSION}-linux-${NODE_FILENAME}.tar.xz
+mv node-v${NODE_VERSION}-linux-${NODE_FILENAME} node
 cd ..
 
-mv dist/node-v${NODE_VERSION}-linux-${NODE_FILENAME} $PKG_DIR/node
 
-rm -r $PKG_DIR/node/lib/node_modules/npm
-rm -r $PKG_DIR/node/include/node
+rm -r $BUILD_DIR/node/lib/node_modules/npm
+rm -r $BUILD_DIR/node/include/node
 
-rm -r $PKG_DIR/node_modules/electron*
-rm -r $PKG_DIR/electron*.js
+rm -r $BUILD_DIR/node_modules/electron*
+rm -r $BUILD_DIR/electron*.js
 
-printf "#!/bin/sh\n./node/bin/node src/main" > $PKG_DIR/trilium.sh
-chmod 755 $PKG_DIR/trilium.sh
+printf "#!/bin/sh\n./node/bin/node src/main" > $BUILD_DIR/trilium.sh
+chmod 755 $BUILD_DIR/trilium.sh
 
-cp bin/tpl/anonymize-database.sql $PKG_DIR/
+cp bin/tpl/anonymize-database.sql $BUILD_DIR/
 
-cp -r translations $PKG_DIR/
+cp -r translations $BUILD_DIR/
 
 VERSION=`jq -r ".version" package.json`
 
-cd dist
-
+mkdir $DIST_DIR
+cp -r "$BUILD_DIR" "$DIST_DIR/trilium-linux-${ARCH}-server"
+cd $DIST_DIR
 tar cJf trilium-linux-${ARCH}-server-${VERSION}.tar.xz trilium-linux-${ARCH}-server