diff --git a/.github/workflows/stress_test.yml b/.github/workflows/stress_test.yml
index 3aa76f19d..18d9bb168 100644
--- a/.github/workflows/stress_test.yml
+++ b/.github/workflows/stress_test.yml
@@ -10,7 +10,6 @@ env:
   POSTGRES_HOST: localhost
   REDIS_HOST: localhost
   MINIO_HOST: localhost
-  GOTRUE_HOST: localhost
   SQLX_OFFLINE: true
   RUST_TOOLCHAIN: "1.78"
 
diff --git a/deploy.env b/deploy.env
index a7b10877e..83f4c10dc 100644
--- a/deploy.env
+++ b/deploy.env
@@ -19,14 +19,9 @@ REDIS_PORT=6379
 MINIO_HOST=minio
 MINIO_PORT=9000
 
-# Gotrue Host
-GOTRUE_HOST=gotrue
-GOTRUE_PORT=9999
-GOTRUE_DATABASE_HOST=postgres
-
 # AppFlowy Cloud
 ## URL that connects to the gotrue docker container
-APPFLOWY_GOTRUE_BASE_URL=http://${GOTRUE_HOST}:${GOTRUE_PORT}
+APPFLOWY_GOTRUE_BASE_URL=http://gotrue:9999
 ## URL that connects to the postgres docker container
 APPFLOWY_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
 APPFLOWY_ACCESS_CONTROL=true
@@ -39,7 +34,7 @@ APPFLOWY_REDIS_URI=redis://${REDIS_HOST}:${REDIS_PORT}
 ## URL that connects to redis docker container
 ADMIN_FRONTEND_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
 ## URL that connects to gotrue docker container
-ADMIN_FRONTEND_GOTRUE_URL=http://${GOTRUE_HOST}:${GOTRUE_PORT}
+ADMIN_FRONTEND_GOTRUE_URL=http://gotrue:9999
 
 # authentication key, change this and keep the key safe and secret
 # self defined key, you can use any string
@@ -76,11 +71,11 @@ GOTRUE_ADMIN_PASSWORD=password
 # Make sure that this domain is accessible to the user
 # Make sure no endswith /
 # Replace with your host name instead of localhost
-API_EXTERNAL_URL=http://localhost:${GOTRUE_PORT}
+API_EXTERNAL_URL=http://localhost:9999
 
 # In docker environment, `postgres` is the hostname of the postgres service
 # GoTrue connect to postgres using this url
-GOTRUE_DATABASE_URL=postgres://supabase_auth_admin:${SUPABASE_PASSWORD}@${GOTRUE_DATABASE_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+GOTRUE_DATABASE_URL=postgres://supabase_auth_admin:${SUPABASE_PASSWORD}@postgres:${POSTGRES_PORT}/${POSTGRES_DB}
 
 # Refer to this for details: https://github.com/AppFlowy-IO/AppFlowy-Cloud/blob/main/doc/AUTHENTICATION.md
 # Google OAuth2