diff --git a/vibn-frontend/app/api/mcp/route.ts b/vibn-frontend/app/api/mcp/route.ts
index 4ef4c0a..4637c10 100644
--- a/vibn-frontend/app/api/mcp/route.ts
+++ b/vibn-frontend/app/api/mcp/route.ts
@@ -4508,10 +4508,7 @@ async function toolShellExec(
     const result = await execInDevContainer({
       projectId: project.id,
       command,
-      cwd:
-        typeof params.cwd === "string"
-          ? params.cwd
-          : `/workspace/${project.slug}`,
+      cwd: typeof params.cwd === "string" ? params.cwd : "/workspace",
       timeoutMs: Number.isFinite(Number(params.timeoutMs))
         ? Number(params.timeoutMs)
         : Number.isFinite(Number(params.timeout_ms))
diff --git a/vibn-frontend/lib/dev-container.ts b/vibn-frontend/lib/dev-container.ts
index 19ced7d..93557a0 100644
--- a/vibn-frontend/lib/dev-container.ts
+++ b/vibn-frontend/lib/dev-container.ts
@@ -908,7 +908,7 @@ export async function startDevServer(
 
   const launch =
     `mkdir -p /var/log/vibn-dev && ` +
-    `cd /workspace/${opts.projectSlug} && ` +
+    `cd /workspace && ` +
     `nohup env PORT=${opts.port} VIBN_DEV_SERVER_ID=${id} ` +
     `bash -lc ${shellEscape(listenSafeCommand)} > ${logFile} 2>&1 & ` +
     `echo $!`;