diff --git a/services/mana-media/apps/api/Dockerfile b/services/mana-media/apps/api/Dockerfile
index 0d3c90c1e..55ad52fb8 100644
--- a/services/mana-media/apps/api/Dockerfile
+++ b/services/mana-media/apps/api/Dockerfile
@@ -1,23 +1,19 @@
 # ================================
-# Build Stage (Monorepo-aware)
+# Build Stage
 # ================================
-FROM node:20-alpine AS base
+FROM node:20-alpine AS builder
 RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
 WORKDIR /app
 
-# Install dependencies
-FROM base AS deps
+# Copy all necessary files
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-COPY packages/shared-drizzle-config/package.json ./packages/shared-drizzle-config/
-COPY services/mana-media/apps/api/package.json ./services/mana-media/apps/api/
-COPY services/mana-media/packages/client/package.json ./services/mana-media/packages/client/
-RUN pnpm install --frozen-lockfile --ignore-scripts
-
-# Build the application
-FROM base AS builder
-COPY --from=deps /app/node_modules ./node_modules
 COPY packages/shared-drizzle-config ./packages/shared-drizzle-config
 COPY services/mana-media ./services/mana-media
+
+# Install all dependencies (ignore client build errors)
+RUN pnpm install --frozen-lockfile || pnpm install --frozen-lockfile --ignore-scripts
+
+# Build the API
 WORKDIR /app/services/mana-media/apps/api
 RUN pnpm build
 
@@ -25,20 +21,19 @@ RUN pnpm build
 # Production Stage
 # ================================
 FROM node:20-alpine AS runner
-RUN corepack enable && corepack prepare pnpm@9.15.0 --activate \
-    && apk add --no-cache postgresql-client wget
+RUN apk add --no-cache wget
 ENV NODE_ENV=production
 
 # Create non-root user
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nestjs
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 nestjs
 USER nestjs
 
 WORKDIR /app
 
-# Copy built application
+# Copy built application and dependencies
 COPY --from=builder --chown=nestjs:nodejs /app/services/mana-media/apps/api/dist ./dist
-COPY --from=builder --chown=nestjs:nodejs /app/services/mana-media/apps/api/node_modules ./node_modules
+COPY --from=builder --chown=nestjs:nodejs /app/node_modules ./node_modules
 COPY --from=builder --chown=nestjs:nodejs /app/services/mana-media/apps/api/package.json ./
 COPY --from=builder --chown=nestjs:nodejs /app/packages/shared-drizzle-config ./packages/shared-drizzle-config