diff --git a/docker-compose.yml b/docker-compose.yml
index 3fd5f99..953070a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,6 +39,10 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile
+      args:
+        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
+        UPLOAD_R2_WORKER_API: ${UPLOAD_R2_WORKER_API}
+        R2_UPLOAD_API_KEY: ${R2_UPLOAD_API_KEY}
     restart: unless-stopped
     environment:
       NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 3efd581..4513524 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -3,6 +3,16 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm ci
 COPY . .
+
+# Build args for NEXT_PUBLIC_ vars (baked in at build time)
+ARG NEXT_PUBLIC_API_URL
+ARG UPLOAD_R2_WORKER_API
+ARG R2_UPLOAD_API_KEY
+
+ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
+ENV UPLOAD_R2_WORKER_API=$UPLOAD_R2_WORKER_API
+ENV R2_UPLOAD_API_KEY=$R2_UPLOAD_API_KEY
+
 RUN npm run build
 
 FROM node:20-alpine AS production
@@ -12,4 +22,4 @@ RUN npm ci --omit=dev
 COPY --from=base /app/.next ./.next
 COPY --from=base /app/public ./public
 EXPOSE 3000
-CMD ["npm", "start"]
\ No newline at end of file
+CMD ["npm", "start"]