diff --git a/docker-compose.yml b/docker-compose.yml
index 62e0c0b..4877db4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,7 @@ services:
         NEXT_PUBLIC_AUTHENTIK_ISSUER: ${NEXT_PUBLIC_AUTHENTIK_ISSUER}
         NEXT_PUBLIC_AUTHENTIK_CLIENT_ID: ${NEXT_PUBLIC_AUTHENTIK_CLIENT_ID}
         NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL:-https://cv.alves.world}
+        API_BASE_URL: ${API_BASE_URL:-http://cvfs-backend:8080}
     environment:
       - API_BASE_URL=http://cvfs-backend:8080
       - AUTHENTIK_ISSUER=${AUTHENTIK_ISSUER}
diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile
index b6b62a0..2dc6ef1 100644
--- a/docker/webapp.Dockerfile
+++ b/docker/webapp.Dockerfile
@@ -11,9 +11,11 @@ FROM deps AS builder
 ARG NEXT_PUBLIC_BASE_URL
 ARG NEXT_PUBLIC_AUTHENTIK_ISSUER
 ARG NEXT_PUBLIC_AUTHENTIK_CLIENT_ID
+ARG API_BASE_URL
 ENV NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL}
 ENV NEXT_PUBLIC_AUTHENTIK_ISSUER=${NEXT_PUBLIC_AUTHENTIK_ISSUER}
 ENV NEXT_PUBLIC_AUTHENTIK_CLIENT_ID=${NEXT_PUBLIC_AUTHENTIK_CLIENT_ID}
+ENV API_BASE_URL=${API_BASE_URL}
 COPY apps/webapp ./
 RUN bun run build