diff --git a/package.json b/package.json
index 54dba02e5..705741628 100644
--- a/package.json
+++ b/package.json
@@ -41,14 +41,14 @@
   },
   "packageManager": "npm@10.9.3",
   "scripts": {
-    "build:pi-tui": "npm run build -w @sf-run/pi-tui",
-    "build:pi-ai": "npm run build -w @sf-run/pi-ai",
-    "build:pi-agent-core": "npm run build -w @sf-run/pi-agent-core",
-    "build:pi-coding-agent": "npm run build -w @sf-run/pi-coding-agent",
-    "build:native-pkg": "npm run build -w @sf-run/native",
-    "build:rpc-client": "npm run build -w @singularity-forge/rpc-client",
+    "build:pi-tui": "bun run --filter @sf-run/pi-tui build",
+    "build:pi-ai": "bun run --filter @sf-run/pi-ai build",
+    "build:pi-agent-core": "bun run --filter @sf-run/pi-agent-core build",
+    "build:pi-coding-agent": "bun run --filter @sf-run/pi-coding-agent build",
+    "build:native-pkg": "bun run --filter @sf-run/native build",
+    "build:rpc-client": "bun run --filter @singularity-forge/rpc-client build",
     "build:pi": "npm run build:native-pkg && npm run build:pi-tui && npm run build:pi-ai && npm run build:pi-agent-core && npm run build:pi-coding-agent",
-    "build:mcp-server": "npm run build -w @singularity-forge/mcp-server",
+    "build:mcp-server": "bun run --filter @singularity-forge/mcp-server build",
     "build:core": "npm run build:pi && npm run build:rpc-client && npm run build:mcp-server && tsc && npm run copy-resources && npm run copy-themes && npm run copy-export-html",
     "build": "npm run build:core && node scripts/build-web-if-stale.cjs",
     "stage:web-host": "node scripts/stage-web-standalone.cjs",
diff --git a/scripts/link-workspace-packages.cjs b/scripts/link-workspace-packages.cjs
index 754a4f195..86e463bc2 100644
--- a/scripts/link-workspace-packages.cjs
+++ b/scripts/link-workspace-packages.cjs
@@ -22,18 +22,19 @@ const { resolve, join } = require('path')
 const root = resolve(__dirname, '..')
 const packagesDir = join(root, 'packages')
 const scopeDirs = {
-  '@gsd': join(root, 'node_modules', '@gsd'),
-  '@gsd-build': join(root, 'node_modules', '@gsd-build'),
+  '@sf-run': join(root, 'node_modules', '@sf-run'),
+  '@singularity-forge': join(root, 'node_modules', '@singularity-forge'),
 }
 
 // Map directory names to scoped package names
 const packageMap = {
-  'native': { scope: '@gsd', name: 'native' },
-  'pi-agent-core': { scope: '@gsd', name: 'pi-agent-core' },
-  'pi-ai': { scope: '@gsd', name: 'pi-ai' },
-  'pi-coding-agent': { scope: '@gsd', name: 'pi-coding-agent' },
-  'pi-tui': { scope: '@gsd', name: 'pi-tui' },
-  'rpc-client': { scope: '@gsd-build', name: 'rpc-client' },
+  'native': { scope: '@sf-run', name: 'native' },
+  'pi-agent-core': { scope: '@sf-run', name: 'pi-agent-core' },
+  'pi-ai': { scope: '@sf-run', name: 'pi-ai' },
+  'pi-coding-agent': { scope: '@sf-run', name: 'pi-coding-agent' },
+  'pi-tui': { scope: '@sf-run', name: 'pi-tui' },
+  'rpc-client': { scope: '@singularity-forge', name: 'rpc-client' },
+  'mcp-server': { scope: '@singularity-forge', name: 'mcp-server' },
 }
 
 for (const scopeDir of Object.values(scopeDirs)) {