diff --git a/genkit/Dockerfile b/genkit/Dockerfile
index 51469df..fb586ff 100644
--- a/genkit/Dockerfile
+++ b/genkit/Dockerfile
@@ -1,15 +1,22 @@
-FROM node:22-alpine
+# Builder stage
+FROM node:22-alpine AS builder
 
 WORKDIR /app
 
 COPY package*.json ./
-
 RUN npm install
 
 COPY . .
-
 RUN npm run build
 
+# Production stage
+FROM node:22-alpine
+
+WORKDIR /app
+
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+
 ENV NODE_ENV=production
 
 EXPOSE 4001
diff --git a/socket.io/Dockerfile b/socket.io/Dockerfile
index 315cd3e..b3e7442 100644
--- a/socket.io/Dockerfile
+++ b/socket.io/Dockerfile
@@ -1,15 +1,22 @@
-FROM node:22-alpine
+# Builder stage
+FROM node:22-alpine AS builder
 
 WORKDIR /app
 
 COPY package*.json ./
-
 RUN npm install
 
 COPY . .
-
 RUN npm run build
 
+# Production stage
+FROM node:22-alpine
+
+WORKDIR /app
+
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+
 ENV NODE_ENV=production
 
 EXPOSE 3001