diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index b01b475b..21ff1c53 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -380,20 +380,19 @@ jobs:
             chown deploy:deploy "$ENV_FILE"
 
             echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin
+            
             echo "→ Pulling image: $IMAGE_TAG"
             docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" pull
-            echo "→ Starting containers..."
-            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" up -d --remove-orphans
+            
+            echo "→ Starting containers (Waiting for Health)..."
+            # Uses --wait to ensure containers are healthy before proceeding
+            # This replaces the brittle 'sleep 15' and manual check
+            docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" up -d --wait --remove-orphans
+            
             docker system prune -f --filter "until=24h"
-            echo "→ Waiting 15s for warmup..."
-            sleep 15
-            echo "→ Container status:"
+            
+            echo "✅ Deployment successful. Containers are Health."
             docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" ps
-            if ! docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" ps | grep -q "Up"; then
-              echo "❌ Fehler: Container nicht Up!"
-              docker compose -p "$PROJECT_NAME" --env-file "$ENV_FILE" logs --tail=150
-              exit 1
-            fi
 
             echo "→ Applying Directus Schema Snapshot..."
             # Note: We check if snapshot exists first to avoid failing if no snapshot is committed yet
diff --git a/Dockerfile b/Dockerfile
index cab333a3..be8bd5c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,84 +1,62 @@
-FROM node:20-alpine AS base
-RUN npm install -g pnpm@10
+# Start from the pre-built Nextjs Base image
+FROM registry.infra.mintel.me/mintel/nextjs:latest AS builder
 
-
-# Install dependencies only when needed
-FROM base AS deps
-RUN apk add --no-cache libc6-compat curl
 WORKDIR /app
 
+# Ensure we are in a clean, standalone environment
+RUN rm -rf packages apps pnpm-workspace.yaml 2>/dev/null || true
+
+# Build-time environment variables for Next.js
+ARG NEXT_PUBLIC_BASE_URL
+ARG DIRECTUS_URL
+ARG NEXT_PUBLIC_TARGET
+ARG NPM_TOKEN
+ARG REGISTRY_HOST
+
+ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
+ENV DIRECTUS_URL=$DIRECTUS_URL
+ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET
+ENV NPM_TOKEN=$NPM_TOKEN
+ENV SKIP_RUNTIME_ENV_VALIDATION=true
+
+# Enable corepack (pnpm is already in base image)
+RUN corepack enable
+
+# Copy package files
+COPY package.json pnpm-lock.yaml* .npmrc ./
 
 # Install dependencies based on the preferred package manager
-COPY package.json pnpm-lock.yaml* ./
-ARG REGISTRY_HOST
-ARG NPM_TOKEN
+# Create .npmrc for private registry access if token is present
 RUN if [ -n "$NPM_TOKEN" ]; then \
     REGISTRY="${REGISTRY_HOST:-npm.infra.mintel.me}" && \
     echo "@mintel:registry=https://$REGISTRY" > .npmrc && \
     echo "//$REGISTRY/:_authToken=$NPM_TOKEN" >> .npmrc; \
     fi
-RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm install --frozen-lockfile
 
+RUN pnpm install --frozen-lockfile
 
-# Rebuild the source code only when needed
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
+# Copy local files
 COPY . .
 
-# Next.js collects completely anonymous telemetry data about general usage.
-# Learn more here: https://nextjs.org/telemetry
-# Uncomment the following line in case you want to disable telemetry during the build.
-ENV NEXT_TELEMETRY_DISABLED=1
+# Build the specific application
+RUN pnpm build
 
-# Build-time environment variables for Next.js
-# These are baked into the client bundle during build
-ARG NEXT_PUBLIC_BASE_URL
-ARG NEXT_PUBLIC_TARGET
-ARG DIRECTUS_URL
-
-ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
-ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET
-ENV DIRECTUS_URL=$DIRECTUS_URL
-
-# Validate environment variables during build
-RUN SKIP_RUNTIME_ENV_VALIDATION=true npx tsx scripts/validate-env.ts
-
-RUN --mount=type=cache,target=/app/.next/cache pnpm run build
-
-# Production image, copy all the files and run next
-FROM base AS runner
-WORKDIR /app
-
-# Install curl for health checks
-RUN apk add --no-cache curl
+# Production runner image
+FROM registry.infra.mintel.me/mintel/runtime:latest AS runner
 
+# Production environment configuration
+ENV HOSTNAME="0.0.0.0"
+ENV PORT=3000
 ENV NODE_ENV=production
-# Uncomment the following line in case you want to disable telemetry during runtime.
-# ENV NEXT_TELEMETRY_DISABLED 1
 
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-COPY --from=builder /app/public ./public
-
-# Set the correct permission for prerender cache
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
-
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
+# Copy standalone output and static files
+COPY --from=builder --chown=nextjs:nodejs /app/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
+# Ensure the cache directory specifically is writeable (Mintel Standard #16)
+COPY --from=builder --chown=nextjs:nodejs /app/.next/cache ./.next/cache
+
 USER nextjs
 
-EXPOSE 3000
-
-ENV PORT=3000
-# set hostname to localhost
-ENV HOSTNAME="0.0.0.0"
-
-# server.js is created by next build from the standalone output
-# https://nextjs.org/docs/pages/api-reference/next-config-js/output
 CMD ["node", "server.js"]