diff --git a/ci/prod/.env.runtime b/ci/prod/.env.runtime
index 42f6500..d6c368c 100644
--- a/ci/prod/.env.runtime
+++ b/ci/prod/.env.runtime
@@ -16,7 +16,6 @@ AMPLI_ENVIRONMENT=production
 API_PROTOCOL=https
 SERVICE_HOST=app.sendico.io
 API_ENDPOINT=/api/v1
-API_UPSTREAM=sendico-bff:8080
 WS_PROTOCOL=wss
 WS_ENDPOINT=/ws
 AMPLITUDE_SECRET=c3d75b3e2520d708440acbb16b923e79
@@ -122,7 +121,7 @@ CADDY_ACME_EMAIL=infra@sendico.io
 BFF_DIR=bff
 BFF_COMPOSE_PROJECT=sendico-bff
 BFF_SERVICE_NAME=sendico_bff
-BFF_HTTP_PORT=8080
+BFF_HTTP_PORT=8081
 
 # Chain gateway stack
 CHAIN_GATEWAY_DIR=chain_gateway
diff --git a/ci/prod/compose/bff.yml b/ci/prod/compose/bff.yml
index 400faf7..605f3da 100644
--- a/ci/prod/compose/bff.yml
+++ b/ci/prod/compose/bff.yml
@@ -41,7 +41,7 @@ services:
       PERMISSION_TIMEOUT: ${PERMISSION_TIMEOUT}
       PERMISSION_IS_FILTERED: ${PERMISSION_IS_FILTERED}
     ports:
-      - "0.0.0.0:${BFF_HTTP_PORT}:8080"
+      - "0.0.0.0:${BFF_HTTP_PORT}:8081"
     healthcheck:
       test: ["CMD-SHELL","wget -qO- http://localhost:8081/api/v1/health | grep -q '\"status\":\"ok\"'"]
       interval: 30s
diff --git a/ci/prod/compose/frontend.yml b/ci/prod/compose/frontend.yml
index 37ea36b..9a1ef16 100644
--- a/ci/prod/compose/frontend.yml
+++ b/ci/prod/compose/frontend.yml
@@ -23,7 +23,6 @@ services:
       API_PROTOCOL: ${API_PROTOCOL}
       SERVICE_HOST: ${SERVICE_HOST}
       API_ENDPOINT: ${API_ENDPOINT}
-      API_UPSTREAM: ${API_UPSTREAM}
       AMPLITUDE_SECRET: ${AMPLITUDE_SECRET}
       DEFAULT_LOCALE: ${DEFAULT_LOCALE}
       DEFAULT_CURRENCY: ${DEFAULT_CURRENCY}
diff --git a/frontend/pweb/caddy/Caddyfile b/frontend/pweb/caddy/Caddyfile
index 84a79f7..1df6dbd 100644
--- a/frontend/pweb/caddy/Caddyfile
+++ b/frontend/pweb/caddy/Caddyfile
@@ -23,8 +23,8 @@
     # Backend API
     ########################################
     handle /api/v1/* {
-      # Allow overriding upstream via API_UPSTREAM, default to the BFF container.
-      reverse_proxy {$API_UPSTREAM:sendico-bff:8081} {
+      # Proxy directly to the BFF container on the Docker network.
+      reverse_proxy sendico-bff:8081 {
         health_uri /api/v1/health
         health_interval 15s
         health_timeout 4s