diff --git a/api/payments/orchestrator/config.yml b/api/payments/orchestrator/config.yml
index 037c328..645d3cc 100644
--- a/api/payments/orchestrator/config.yml
+++ b/api/payments/orchestrator/config.yml
@@ -46,7 +46,7 @@ ledger:
   insecure: true
 
 gateway:
-  address: "sendico_chain_gateway:50054"
+  address: "sendico_chain_gateway:50070"
   dial_timeout_seconds: 5
   call_timeout_seconds: 3
   insecure: true
diff --git a/api/server/config.yml b/api/server/config.yml
index 124b6ff..cb4c79e 100755
--- a/api/server/config.yml
+++ b/api/server/config.yml
@@ -71,12 +71,13 @@ api:
     #   secret_access_key_env: S3_ACCESS_KEY_SECRET
     #   region_env: S3_REGION
     #   bucket_name_env: S3_BUCKET_NAME
-   driver: local_fs
-   settings:
-     root_path: ./storage
+    driver: local_fs
+    settings:
+      root_path: ./storage
 
   chain_gateway:
-    address: sendico-chain-gateway
+    address: sendico_chain_gateway:50070
+    address_env: CHAIN_GATEWAY_ADDRESS
     dial_timeout_seconds: 5
     call_timeout_seconds: 5
     insecure: true
diff --git a/ci/prod/.env.runtime b/ci/prod/.env.runtime
index 13712ad..d67f10c 100644
--- a/ci/prod/.env.runtime
+++ b/ci/prod/.env.runtime
@@ -127,6 +127,7 @@ BFF_HTTP_PORT=8080
 CHAIN_GATEWAY_DIR=chain_gateway
 CHAIN_GATEWAY_COMPOSE_PROJECT=sendico-chain-gateway
 CHAIN_GATEWAY_SERVICE_NAME=sendico_chain_gateway
+CHAIN_GATEWAY_ADDRESS=sendico_chain_gateway:50070
 CHAIN_GATEWAY_GRPC_PORT=50070
 CHAIN_GATEWAY_METRICS_PORT=9404
 
diff --git a/ci/prod/compose/bff.yml b/ci/prod/compose/bff.yml
index 605f3da..550c6b0 100644
--- a/ci/prod/compose/bff.yml
+++ b/ci/prod/compose/bff.yml
@@ -29,6 +29,7 @@ services:
       NATS_PORT: ${NATS_PORT}
       NATS_USER: ${NATS_USER}
       NATS_PASSWORD: ${NATS_PASSWORD}
+      CHAIN_GATEWAY_ADDRESS: ${CHAIN_GATEWAY_ADDRESS}
       MONGO_HOST: ${MONGO_HOST}
       MONGO_PORT: ${MONGO_PORT}
       MONGO_DATABASE: ${MONGO_DATABASE}