diff --git a/Dockerfile b/Dockerfile
index 589d56d..50f3f3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,42 @@ FROM node:20-alpine as builder
 
 WORKDIR /app
 
-RUN npm install -g pnpm@9
+RUN npm install -g pnpm@10
 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
+
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY packages packages
 COPY tooling tooling
 COPY .env .env
-COPY .env.production .env.production
 COPY .env.staging .env.staging
 
+RUN cat > .env.local << EOF
+# PRODUCTION BUILD ENVIRONMENT VARIABLES
+
+# MEDUSA
+MEDUSA_BACKEND_URL=${MEDUSA_BACKEND_URL}
+NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY=${NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY}
+
+# SUPABASE
+SUPABASE_SERVICE_ROLE_KEY=${SUPABASE_SERVICE_ROLE_KEY}
+NEXT_PUBLIC_SUPABASE_URL=${NEXT_PUBLIC_SUPABASE_URL}
+NEXT_PUBLIC_SUPABASE_ANON_KEY=${NEXT_PUBLIC_SUPABASE_ANON_KEY}
+
+# SITE
+NEXT_PUBLIC_SITE_URL=${NEXT_PUBLIC_SITE_URL}
+
+# MONTONIO
+NEXT_PUBLIC_MONTONIO_ACCESS_KEY=${NEXT_PUBLIC_MONTONIO_ACCESS_KEY}
+EOF
+
 # Load env file and echo a specific variable
 # RUN dotenv -e .env -- printenv | grep 'SUPABASE' || true
 RUN pnpm install --frozen-lockfile
@@ -38,7 +64,8 @@ WORKDIR /app
 
 COPY --from=builder /app ./
 
-RUN cp ".env.${APP_ENV}" .env.local
+COPY --from=builder /app/.env.local .env.local
+COPY --from=builder /app/.env.${APP_ENV} .env.production
 
 RUN npm install -g pnpm@9 \
  && pnpm install --prod --frozen-lockfile
@@ -46,7 +73,8 @@ RUN npm install -g pnpm@9 \
 ENV NODE_ENV=production
 
 # 🔍 Optional: Log key envs for debug
-RUN echo "📄 .env contents:" && cat .env.local \
+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