diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 5e7e43e4..029e151a 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -10,13 +10,13 @@
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
-    "typecheck": "npm run typecheck:node && npm run typecheck:web",
+    "typecheck": "pnpm run typecheck:node && pnpm run typecheck:web",
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
-    "build": "npm run typecheck && electron-vite build",
+    "build": "pnpm run typecheck && electron-vite build",
     "postinstall": "electron-builder install-app-deps",
-    "build:unpack": "npm run build && electron-builder --dir",
-    "build:win": "npm run build && electron-builder --win",
+    "build:unpack": "pnpm run build && electron-builder --dir",
+    "build:win": "pnpm run build && electron-builder --win",
     "build:mac": "electron-vite build && electron-builder --mac",
     "build:linux": "electron-vite build && electron-builder --linux"
   },
diff --git a/apps/server/package.json b/apps/server/package.json
index 7eaecefd..df60c2c6 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -9,8 +9,8 @@
     ".env"
   ],
   "scripts": {
-    "compile": "tsc --noEmit",
-    "build": "tsup-node",
+    "compile": "tsc --noEmit -p tsconfig.json",
+    "build": "pnpm run compile && tsup-node",
     "clean": "del-cli dist isolate tsconfig.tsbuildinfo",
     "lint": "eslint . --max-warnings 0",
     "dev": "nodemon --env-file .env dist/index.js"
diff --git a/packages/core/package.json b/packages/core/package.json
index a36e6422..b158c616 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -13,7 +13,7 @@
     "compile": "tsc --noEmit",
     "test": "vitest",
     "lint": "eslint . --max-warnings 0",
-    "build?": "No build step required. This package links directly to its source files",
+    "build": "tsc",
     "coverage": "vitest run --coverage "
   },
   "author": "Hakan Shehu",