diff --git a/api/server/config.dev.yml b/api/server/config.dev.yml
index db1ea76b..77a132bb 100755
--- a/api/server/config.dev.yml
+++ b/api/server/config.dev.yml
@@ -76,8 +76,8 @@ api:
       root_path: ./storage
 
   chain_gateway:
-    address: dev-chain-gateway:50070
-    address_env: CHAIN_GATEWAY_ADDRESS
+    address: dev-tron-gateway:50071
+    address_env: TRON_GATEWAY_ADDRESS
     dial_timeout_seconds: 5
     call_timeout_seconds: 5
     insecure: true
diff --git a/api/server/config.yml b/api/server/config.yml
index c2ffcbd4..4ab970ae 100755
--- a/api/server/config.yml
+++ b/api/server/config.yml
@@ -76,8 +76,8 @@ api:
       root_path: ./storage
 
   chain_gateway:
-    address: sendico_chain_gateway:50070
-    address_env: CHAIN_GATEWAY_ADDRESS
+    address: sendico_tron_gateway:50071
+    address_env: TRON_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 6a3763f2..612f93e2 100644
--- a/ci/prod/.env.runtime
+++ b/ci/prod/.env.runtime
@@ -199,12 +199,13 @@ TGSETTLE_GATEWAY_MONGO_DATABASE=tgsettle_gateway
 TGSETTLE_GATEWAY_MONGO_AUTH_SOURCE=admin
 TGSETTLE_GATEWAY_MONGO_REPLICA_SET=sendico-rs
 
-# Tron documents stack
+# Tron gateway stack
 TRON_GATEWAY_DIR=tron_gateway
 TRON_GATEWAY_COMPOSE_PROJECT=sendico-tron-gateway
 TRON_GATEWAY_SERVICE_NAME=sendico_tron_gateway
 TRON_GATEWAY_GRPC_PORT=50071
 TRON_GATEWAY_METRICS_PORT=9408
+TRON_GATEWAY_ADDRESS=sendico_tron_gateway:50071
 
 # Tron documents Mongo settings
 TRON_GATEWAY_MONGO_HOST=sendico_db1
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index c01cdf40..ba77277d 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -792,7 +792,7 @@ services:
       NATS_URL: nats://${NATS_USER}:${NATS_PASSWORD}@dev-nats:4222
       LEDGER_ADDRESS: dev-ledger:50052
       PAYMENTS_ADDRESS: dev-payments-orchestrator:50062
-      CHAIN_GATEWAY_ADDRESS: dev-chain-gateway:50070
+      TRON_GATEWAY_ADDRESS: dev-tron-gateway:50070
       BFF_HTTP_PORT: 8080
       API_PROTOCOL: http
       SERVICE_HOST: localhost