diff --git a/apps/server/scripts/build-server.sh b/apps/server/scripts/build-server.sh
index 645c2d8ea..4c487185b 100644
--- a/apps/server/scripts/build-server.sh
+++ b/apps/server/scripts/build-server.sh
@@ -27,10 +27,6 @@ BUILD_DIR="./build"
 DIST_DIR="./dist"
 CLEANUP_SCRIPT="./scripts/cleanupNodeModules.ts"
 
-# Build the package dependencies
-npm run build:packages --prefix ../..
-npm run client:build --prefix ../..
-
 # Trigger the build
 echo "Build start"
 npm run build:prepare-dist
diff --git a/package-lock.json b/package-lock.json
index ef9796bea..522b101e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,7 @@
         "": {
             "name": "trilium",
             "version": "0.93.0",
+            "hasInstallScript": true,
             "license": "AGPL-3.0-only",
             "devDependencies": {
                 "tsx": "^4.19.3"
diff --git a/package.json b/package.json
index f2469f93d..849e8f04a 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
         ]
     },
     "scripts": {
-        "build": "npm run client:build && npm run server:build",
         "build:packages": "npm --workspace=packages/commons run build",
         "test": "npm --workspace=apps/client --workspace=apps/server run test",
 
@@ -28,9 +27,9 @@
         "server:test": "npm --workspace=apps/server run test",
         "server:coverage": "npm --workspace=apps/server run coverage",
         "server:build": "npm --workspace=apps/server run build:ts",
-        "server:package": "npm --workspace=apps/server run package",
+        "server:package": "npm run build:packages && npm run client:build && npm --workspace=apps/server run package",
 
-        "electron-forge:make": "npm --workspace=apps/desktop run electron-forge:make",
+        "electron-forge:make": "npm run build:packages && npm run client:build && npm run server:build && npm --workspace=apps/desktop run electron-forge:make",
 
         "chore:ci-update-nightly-version": "tsx ./scripts/update-nightly-version.ts",
         "chore:update-build-info": "tsx ./scripts/update-build-info.ts"