diff --git a/docker-compose.yaml b/docker-compose.yaml
index 09eb8728f..b37833d89 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -4,12 +4,10 @@
 #
 # Build:  DOCKER_BUILDKIT=1 docker compose build
 # Run:    docker compose up -d
-
 services:
   # Message broker for payment event delivery (payment-api -> passenger/freight).
   # Management UI: http://localhost:15672 (login edr / edr_secret). vhost: payment.
   # In deployed envs this is a shared/managed RabbitMQ; only PAYMENT_RABBITMQ_URL changes.
-
   freight-api:
     build:
       context: .
@@ -41,8 +39,8 @@ services:
       args:
         TURBO_FILTER: "@edr/freight-portal"
         APP_PATH: apps/edr-freight-web/portal
-        # Browser-reachable URL; override for production deployments
-        VITE_API_URL: ${FREIGHT_VITE_API_URL:-https://edrfreightapi.triaplc.com/api}
+      env_file:
+        - apps/edr-freight-web/portal/.env
       secrets:
         - npmrc
     ports:
@@ -55,7 +53,8 @@ services:
       args:
         TURBO_FILTER: "@edr/freight-backoffice"
         APP_PATH: apps/edr-freight-web/backoffice
-        VITE_API_URL: ${FREIGHT_VITE_API_URL:-https://edrfreightapi.triaplc.com/api}
+      env_file:
+        - apps/edr-freight-web/backoffice/.env
       secrets:
         - npmrc
     ports:
@@ -68,7 +67,8 @@ services:
       args:
         APP_PACKAGE: "@edr/passenger-portal"
         APP_PATH: apps/edr-passenger-web/portal
-        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://localhost:4000}
+      env_file:
+        - apps/edr-passenger-web/portal/.env
       secrets:
         - npmrc
     ports:
@@ -83,7 +83,8 @@ services:
       args:
         APP_PACKAGE: "@edr/passenger-backoffice"
         APP_PATH: apps/edr-passenger-web/backoffice
-        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://localhost:4000}
+      env_file:
+        - apps/edr-passenger-web/backoffice/.env
       secrets:
         - npmrc
     ports: