diff --git a/docker-compose.yml b/docker-compose.yml
index 5b915b9..af01824 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -144,13 +144,12 @@ services:
   context7-mcp:
     build:
       context: ./vendor/context7
-      dockerfile: Dockerfile
+      dockerfile: ../../dockerfiles/context7/Dockerfile
     container_name: KNELDevStack-AIMiddleware-context7-mcp
     restart: unless-stopped
     environment:
       - UPSTASH_REDIS_REST_URL=${UPSTASH_REDIS_REST_URL}
       - UPSTASH_REDIS_REST_TOKEN=${UPSTASH_REDIS_REST_TOKEN}
-    command: ["node", "packages/mcp/dist/index.js", "--transport", "stdio"]
     profiles:
       - dev
 
diff --git a/dockerfiles/context7/Dockerfile b/dockerfiles/context7/Dockerfile
new file mode 100644
index 0000000..169be66
--- /dev/null
+++ b/dockerfiles/context7/Dockerfile
@@ -0,0 +1,19 @@
+FROM node:22-alpine
+
+# Install pnpm for monorepo
+RUN npm install -g pnpm
+
+WORKDIR /app
+
+# Copy all source first
+COPY . .
+
+# Install all workspace dependencies (from within source tree)
+RUN pnpm install
+
+# Build MCP package specifically
+RUN pnpm build:mcp
+
+# Set entrypoint to run MCP server
+ENTRYPOINT ["node", "packages/mcp/dist/index.js"]
+CMD ["--transport", "stdio"]