diff --git a/docker-compose.frontend.yml b/docker-compose.frontend.yml
index 9b80454..c1077ce 100644
--- a/docker-compose.frontend.yml
+++ b/docker-compose.frontend.yml
@@ -2,8 +2,10 @@ services:
   frontend:
     build:
       context: ./frontend
+      args:
+        NEXT_PUBLIC_BACKEND_URL: ${NEXT_PUBLIC_BACKEND_URL:-https://backend.basetracker.lona-development.org}
     environment:
-      NEXT_PUBLIC_BACKEND_URL: https://backend.basetracker.lona-development.org
+      NEXT_PUBLIC_BACKEND_URL: ${NEXT_PUBLIC_BACKEND_URL:-https://backend.basetracker.lona-development.org}
     ports:
       - "3100:3000"
     expose:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index e8e32ca..abcd5c0 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -2,6 +2,9 @@ FROM node:20-alpine
 
 WORKDIR /app
 
+ARG NEXT_PUBLIC_BACKEND_URL="http://localhost:4100"
+ENV NEXT_PUBLIC_BACKEND_URL=${NEXT_PUBLIC_BACKEND_URL}
+
 COPY package.json ./
 COPY tsconfig.json ./
 COPY next.config.js ./