diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index 8e07862..6d0b762 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -7,16 +7,21 @@ FROM base AS deps
 COPY package.json pnpm-workspace.yaml pnpm-lock.yaml* ./
 COPY apps/api/package.json ./apps/api/
 COPY packages/database/package.json ./packages/database/
-RUN pnpm install --frozen-lockfile 2>/dev/null || pnpm install
+RUN pnpm install --no-frozen-lockfile 2>/dev/null
 
 FROM base AS builder
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
-ARG DATABASE_URL
-ENV DATABASE_URL=$DATABASE_URL
-RUN pnpm --filter @moraworld/database generate
-RUN pnpm --filter @moraworld/database build
-RUN pnpm --filter @moraworld/api build
+RUN echo "=== Checking prisma binary ===" && \
+    ls -la node_modules/.bin/prisma* 2>&1; \
+    echo "=== Checking schema ===" && \
+    ls -la packages/database/prisma/schema.prisma 2>&1; \
+    echo "=== Running prisma generate ===" && \
+    cd packages/database && pnpm exec prisma generate 2>&1; \
+    echo "=== Building database ===" && \
+    cd /app && pnpm --filter @moraworld/database build 2>&1; \
+    echo "=== Building api ===" && \
+    cd /app && pnpm --filter @moraworld/api build 2>&1
 
 FROM node:22-alpine AS runner
 WORKDIR /app
@@ -26,4 +31,4 @@ COPY --from=builder /app/apps/api/package.json ./
 COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/packages/database/node_modules/.prisma ./node_modules/.prisma
 EXPOSE 3001
-CMD ["node", "dist/main.js"]
+CMD ["node", "dist/main.js"]
\ No newline at end of file
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index 166df85..de398b1 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -7,17 +7,19 @@ FROM base AS deps
 COPY package.json pnpm-workspace.yaml pnpm-lock.yaml* ./
 COPY apps/web/package.json ./apps/web/
 COPY packages/database/package.json ./packages/database/
-RUN pnpm install --frozen-lockfile 2>/dev/null || pnpm install
+RUN pnpm install --no-frozen-lockfile 2>/dev/null
 
 FROM base AS builder
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
-ARG DATABASE_URL
-ENV DATABASE_URL=$DATABASE_URL
 ARG NEXT_PUBLIC_API_URL=http://localhost:3001
 ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
-RUN pnpm --filter @moraworld/database generate
-RUN pnpm --filter @moraworld/web build
+RUN echo "=== Checking prisma binary ===" && \
+    ls -la node_modules/.bin/prisma* 2>&1; \
+    echo "=== Running prisma generate ===" && \
+    cd packages/database && pnpm exec prisma generate 2>&1; \
+    echo "=== Building web ===" && \
+    cd /app && pnpm --filter @moraworld/web build 2>&1
 
 FROM node:22-alpine AS runner
 WORKDIR /app