diff --git a/docker-compose-cass-es.yml b/docker-compose-cass-es.yml
index c035522b..df15239c 100644
--- a/docker-compose-cass-es.yml
+++ b/docker-compose-cass-es.yml
@@ -37,6 +37,8 @@ services:
       - ENABLE_ES=true
       - ES_SEEDS=elasticsearch
       - ES_VERSION=v7
+      - TEMPORAL_ADDRESS=temporal:7233
+      - TEMPORAL_CLI_ADDRESS=temporal:7233
     image: temporalio/auto-setup:${TEMPORAL_VERSION}
     networks:
       - temporal-network
diff --git a/docker-compose-mysql-es.yml b/docker-compose-mysql-es.yml
index 00ae5d94..c323b7ce 100644
--- a/docker-compose-mysql-es.yml
+++ b/docker-compose-mysql-es.yml
@@ -42,6 +42,8 @@ services:
       - ENABLE_ES=true
       - ES_SEEDS=elasticsearch
       - ES_VERSION=v7
+      - TEMPORAL_ADDRESS=temporal:7233
+      - TEMPORAL_CLI_ADDRESS=temporal:7233
     image: temporalio/auto-setup:${TEMPORAL_VERSION}
     networks:
       - temporal-network
diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
index dd98e0a0..c3eeec19 100644
--- a/docker-compose-mysql.yml
+++ b/docker-compose-mysql.yml
@@ -22,6 +22,8 @@ services:
       - MYSQL_PWD=root
       - MYSQL_SEEDS=mysql
       - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml
+      - TEMPORAL_ADDRESS=temporal:7233
+      - TEMPORAL_CLI_ADDRESS=temporal:7233
     image: temporalio/auto-setup:${TEMPORAL_VERSION}
     networks:
       - temporal-network
diff --git a/docker-compose-postgres-opensearch.yml b/docker-compose-postgres-opensearch.yml
index 4b19c247..cda9ea37 100644
--- a/docker-compose-postgres-opensearch.yml
+++ b/docker-compose-postgres-opensearch.yml
@@ -51,6 +51,8 @@ services:
       - ENABLE_ES=true
       - ES_SEEDS=opensearch
       - ES_VERSION=v7
+      - TEMPORAL_ADDRESS=temporal:7233
+      - TEMPORAL_CLI_ADDRESS=temporal:7233
     image: temporalio/auto-setup:${TEMPORAL_VERSION}
     networks:
       - temporal-network
diff --git a/docker-compose-postgres.yml b/docker-compose-postgres.yml
index a28f0255..051bd214 100644
--- a/docker-compose-postgres.yml
+++ b/docker-compose-postgres.yml
@@ -23,6 +23,8 @@ services:
       - POSTGRES_PWD=temporal
       - POSTGRES_SEEDS=postgresql
       - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml
+      - TEMPORAL_ADDRESS=temporal:7233
+      - TEMPORAL_CLI_ADDRESS=temporal:7233
     image: temporalio/auto-setup:${TEMPORAL_VERSION}
     networks:
       - temporal-network
diff --git a/docker-compose-tls.yml b/docker-compose-tls.yml
index 219b73b1..11258af7 100644
--- a/docker-compose-tls.yml
+++ b/docker-compose-tls.yml
@@ -76,6 +76,8 @@ services:
       - ES_SCHEME=https
       - ES_USER=elastic
       - ES_PWD=elastic
+      - TEMPORAL_ADDRESS=temporal:7233
+      - TEMPORAL_CLI_ADDRESS=temporal:7233
     networks:
       - temporal-network
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index e2906e3d..34bc7118 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,6 +44,8 @@ services:
       - ENABLE_ES=true
       - ES_SEEDS=elasticsearch
       - ES_VERSION=v7
+      - TEMPORAL_ADDRESS=temporal:7233
+      - TEMPORAL_CLI_ADDRESS=temporal:7233
     image: temporalio/auto-setup:${TEMPORAL_VERSION}
     networks:
       - temporal-network