diff --git a/packages/tauri-app/package.json b/packages/tauri-app/package.json
index e7e749d8..d3db614e 100644
--- a/packages/tauri-app/package.json
+++ b/packages/tauri-app/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "tauri dev",
     "prebuild": "node ./scripts/prebuild.js",
+    "bundle:server": "npm --workspace @neuralnomads/codenomad run build && npm run prebuild",
     "build": "tauri build"
   },
   "devDependencies": {
diff --git a/packages/tauri-app/src-tauri/tauri.conf.json b/packages/tauri-app/src-tauri/tauri.conf.json
index 8e0ca4ea..1a970f00 100644
--- a/packages/tauri-app/src-tauri/tauri.conf.json
+++ b/packages/tauri-app/src-tauri/tauri.conf.json
@@ -5,7 +5,7 @@
   "identifier": "ai.opencode.client",
   "build": {
     "beforeDevCommand": "",
-    "beforeBuildCommand": "npm run prebuild",
+    "beforeBuildCommand": "npm run bundle:server",
     "frontendDist": "../src"
   },
   "app": {