diff --git a/Dockerfile b/Dockerfile
index 11114e3..18598be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,13 @@ WORKDIR /app
 RUN npm install -g pnpm@9
 RUN npm install -g dotenv-cli
 
-ARG MEDUSA_BACKEND_URL
 ARG NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY
-ARG SUPABASE_SERVICE_ROLE_KEY
 ARG NEXT_PUBLIC_SUPABASE_URL
 ARG NEXT_PUBLIC_SUPABASE_ANON_KEY
 ARG NEXT_PUBLIC_SITE_URL
 ARG NEXT_PUBLIC_MONTONIO_ACCESS_KEY
+ARG MEDUSA_BACKEND_URL
+ARG SUPABASE_SERVICE_ROLE_KEY
 ARG JOBS_API_TOKEN
 
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -55,31 +55,21 @@ ENV NODE_ENV=production
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 ENV ENABLE_REACT_COMPILER=false
 
-RUN echo "🔍 Checking environment files before build:" && \
-    ls -la .env* && \
-    echo "🔍 Contents of .env.production:" && \
-    cat .env.production > /tmp/env-debug.log && \
-    cat /tmp/env-debug.log && \
-    echo "🔍 Contents of .env.local:" && \
-    cat .env.local >> /tmp/env-debug.log && \
-    cat .env.local && \
-    echo "🔍 Parameter Store variables received:" && \
-    printenv | grep -E "MEDUSA_BACKEND_URL|NEXT_PUBLIC_SUPABASE_URL|NEXT_PUBLIC_SITE_URL|JOBS_API_TOKEN" | tee -a /tmp/env-debug.log && \
-    echo "🔍 Starting Next.js build:" && \
-    pnpm build --debug
+RUN set -a \
+ && . .env.production \
+ && set +a \
+ && node check-env.js \
+ && pnpm build
 
 # --- Stage 2: Runtime ---
 FROM node:20-alpine
-ARG APP_ENV=production
 
 WORKDIR /app
 
 COPY --from=builder /app ./
-COPY --from=builder /app/.env.${APP_ENV} .env.production
+COPY --from=builder /app/.env.production .env.production
 COPY --from=builder /app/.env.local .env.local
 
-RUN cp ".env.${APP_ENV}" .env.local
-
 RUN npm install -g pnpm@9 \
     && pnpm install --prod --frozen-lockfile
 
@@ -88,7 +78,7 @@ ENV NODE_ENV=production
 # 🔍 Optional: Log key envs for debug
 RUN echo "📄 .env.local contents:" && cat .env.local \
  && echo "📄 .env.production contents:" && cat .env.production \
- && echo "🔧 Current ENV available to Next.js build:" && printenv | grep -E 'SUPABASE|STRIPE|NEXT|NODE_ENV' || true
+ && echo "🔧 Current ENV available to Next.js build:" && printenv | grep -E 'SUPABASE|STRIPE|NEXT|NODE_ENV|MEDUSA|JOBS' || true
 
 
 EXPOSE 3000