diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index afa3bc5..f289994 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -8,14 +8,14 @@ COPY package.json pnpm-workspace.yaml pnpm-lock.yaml* ./
 COPY apps/api/package.json ./apps/api/
 COPY packages/database/ ./packages/database/
 RUN pnpm install --frozen-lockfile 2>/dev/null || pnpm install
-RUN cd packages/database && pnpm exec prisma generate
+RUN cd packages/database && pnpm exec prisma generate && pnpm build
 
 FROM base AS builder
+COPY . .
 COPY --from=deps /app/node_modules ./node_modules
-COPY --from=deps /app/packages/database ./packages/database
-COPY apps/api ./apps/api
-RUN cd packages/database && pnpm build && \
-    cd /app && pnpm --filter @moraworld/api build
+COPY --from=deps /app/packages/database/node_modules/.prisma ./packages/database/node_modules/.prisma
+ARG DATABASE_URL
+RUN pnpm --filter @moraworld/api build
 
 FROM node:22-alpine AS runner
 WORKDIR /app
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index 067983f..825bc1e 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -11,9 +11,9 @@ RUN pnpm install --frozen-lockfile 2>/dev/null || pnpm install
 RUN cd packages/database && pnpm exec prisma generate
 
 FROM base AS builder
+COPY . .
 COPY --from=deps /app/node_modules ./node_modules
-COPY --from=deps /app/packages/database ./packages/database
-COPY apps/web ./apps/web
+COPY --from=deps /app/packages/database/node_modules/.prisma ./packages/database/node_modules/.prisma
 ARG NEXT_PUBLIC_API_URL=http://localhost:3001
 ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
 RUN pnpm --filter @moraworld/web build