diff --git a/.dockerignore b/.dockerignore
index 96880e9..1a4fa41 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,7 +4,7 @@ dist/
 build/
 
 # Dependencies
-node_modules/
+**/node_modules/
 
 # Cache
 .cache/
diff --git a/frontend/packages/inspector/Dockerfile b/frontend/packages/inspector/Dockerfile
index 09cd504..5cfd5bc 100644
--- a/frontend/packages/inspector/Dockerfile
+++ b/frontend/packages/inspector/Dockerfile
@@ -1,15 +1,20 @@
 FROM node:22-alpine AS build
 WORKDIR /app
-RUN npm install -g pnpm
+RUN npm install -g pnpm@9
 
 # Copy package files for all workspaces
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY frontend/packages/inspector/package.json ./frontend/packages/inspector/
 COPY sdks/typescript/package.json ./sdks/typescript/
+COPY sdks/cli-shared/package.json ./sdks/cli-shared/
 
 # Install dependencies
 RUN pnpm install --filter @sandbox-agent/inspector...
 
+# Copy cli-shared source and build it
+COPY sdks/cli-shared ./sdks/cli-shared
+RUN cd sdks/cli-shared && pnpm exec tsup
+
 # Copy SDK source (with pre-generated types)
 COPY sdks/typescript ./sdks/typescript
 
diff --git a/frontend/packages/website/Dockerfile b/frontend/packages/website/Dockerfile
index 0c2b315..c585bbb 100644
--- a/frontend/packages/website/Dockerfile
+++ b/frontend/packages/website/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:22-alpine AS build
 WORKDIR /app
-RUN npm install -g pnpm
+RUN npm install -g pnpm@9
 
 # Copy website package
 COPY frontend/packages/website/package.json ./