diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 7f2bda1..d8f8899 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -36,9 +36,9 @@ services:
     build:
       context: ../frontend
       dockerfile: Dockerfile
+      args:
+        NEXT_PUBLIC_API_URL: https://codetutor-demo.kschappell.com
     container_name: codetutor-frontend
-    environment:
-      NEXT_PUBLIC_API_URL: https://codetutor-demo.kschappell.com
     depends_on:
       - backend
     restart: unless-stopped
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index ddcf713..7afc5e4 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -14,6 +14,9 @@ COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED=1
 
+ARG NEXT_PUBLIC_API_URL
+ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
+
 RUN npm run build
 
 FROM base AS runner