diff --git a/.nx/version-plans/version-plan-1768179365920.md b/.nx/version-plans/version-plan-1768179365920.md
new file mode 100644
index 000000000..ff4b27029
--- /dev/null
+++ b/.nx/version-plans/version-plan-1768179365920.md
@@ -0,0 +1,5 @@
+---
+desktop: patch
+---
+
+Fix Windows binary path
diff --git a/apps/desktop/build.ts b/apps/desktop/build.ts
index c0ae75b8c..1970123f0 100644
--- a/apps/desktop/build.ts
+++ b/apps/desktop/build.ts
@@ -8,8 +8,8 @@ const config: Configuration = {
   artifactName: '${productName}-${version}-${platform}-${arch}.${ext}',
   asarUnpack: [
     'resources/**',
-    '**/node_modules/@the-dev-tools/server/dist/server',
-    '**/node_modules/@the-dev-tools/cli/dist/cli',
+    '**/node_modules/@the-dev-tools/server/dist/server*',
+    '**/node_modules/@the-dev-tools/cli/dist/cli*',
   ],
   extraMetadata: {
     name: 'DevTools',
diff --git a/apps/desktop/src/main/index.ts b/apps/desktop/src/main/index.ts
index d086c0a8e..6796044a1 100644
--- a/apps/desktop/src/main/index.ts
+++ b/apps/desktop/src/main/index.ts
@@ -109,7 +109,7 @@ const server = pipe(
     );
 
     yield* pipe(
-      path.join(dist, 'server'),
+      path.join(dist, os.platform() === 'win32' ? 'server.exe' : 'server'),
       String.replaceAll('app.asar', 'app.asar.unpacked'),
       Command.make,
       Command.env({
@@ -261,7 +261,10 @@ const cli = pipe(
       Effect.flatMap(path.fromFileUrl),
     );
 
-    const bin = pipe(path.join(dist, 'cli'), String.replaceAll('app.asar', 'app.asar.unpacked'));
+    const bin = pipe(
+      path.join(dist, os.platform() === 'win32' ? 'cli.exe' : 'cli'),
+      String.replaceAll('app.asar', 'app.asar.unpacked'),
+    );
 
     yield* pipe(Command.make(bin, ...args), Command.stdout('inherit'), Command.stderr('inherit'), Command.exitCode);
 
diff --git a/packages/server/project.json b/packages/server/project.json
index 23ecf3c11..2f353d778 100644
--- a/packages/server/project.json
+++ b/packages/server/project.json
@@ -13,7 +13,7 @@
       "cache": false,
       "options": {
         "cwd": "{projectRoot}",
-        "command": "go build -o dist/server cmd/server/server.go",
+        "command": "go build -o dist/ cmd/server/server.go",
         "env": {
           "CGO_ENABLED": "0"
         }
@@ -25,7 +25,7 @@
       "cache": true,
       "options": {
         "cwd": "{projectRoot}",
-        "command": "go build -o dist/server cmd/server/server.go",
+        "command": "go build -o dist/ cmd/server/server.go",
         "env": {
           "CGO_ENABLED": "0"
         }