diff --git a/.envrc.local.template b/.envrc.local.template
index e1b33e749543c20673c4f75dfe30e58a1977807f..1e2ccce2ab5bfaf4b324dd1be323ce7c2dfbc759 100644
--- a/.envrc.local.template
+++ b/.envrc.local.template
@@ -6,5 +6,6 @@ export CHAT_OIDC_ISSUER=https://dev-auth.holi.social
 
 # Chat environment variables
 export CHAT_SERVER_URL="http://192.168.180.44:8008"
+export CHAT_SERVER_NAME="local.chat.holi.social"
 export CHAT_ADMIN_USERNAME=""
 export CHAT_ADMIN_ACCESS_TOKEN=""
\ No newline at end of file
diff --git a/src/constants.ts b/src/constants.ts
index 05be9b15de7c71715961b6e2ccd863831b574f99..4748a218023d83669bf910e8e2a998909803e502 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,3 +1,4 @@
 export const CHAT_SERVER_URL = process.env.CHAT_SERVER_URL
+export const CHAT_SERVER_NAME = process.env.CHAT_SERVER_NAME
 export const CHAT_ADMIN_USERNAME = process.env.CHAT_ADMIN_USERNAME
 export const CHAT_ADMIN_ACCESS_TOKEN = process.env.CHAT_ADMIN_ACCESS_TOKEN
diff --git a/src/helpers/rooms.ts b/src/helpers/rooms.ts
index de9da675cbaa1ad2f6b8b8b6a44808f38d0f089e..1fc72d417b2cc43a01e8fb58205d94e84798fcb8 100644
--- a/src/helpers/rooms.ts
+++ b/src/helpers/rooms.ts
@@ -1,7 +1,7 @@
-import { CHAT_ADMIN_ACCESS_TOKEN, CHAT_SERVER_URL } from '../constants'
+import { CHAT_ADMIN_ACCESS_TOKEN, CHAT_SERVER_NAME, CHAT_SERVER_URL } from '../constants'
 import { ChatRoomEvent } from './type'
 
-export const getMatrixUserId = (holiIdentity: string) => `@${holiIdentity}:local.chat.holi.social`
+export const getMatrixUserId = (holiIdentity: string) => `@${holiIdentity}:${CHAT_SERVER_NAME}`
 
 export const getRooms = async (searchTerm?: string) => {
   const resp = await fetch(
diff --git a/terraform/common/function.tf b/terraform/common/function.tf
index 7a254b5b263f37c64799aeebe0560d7531fab319..19e9247e11b23881ac48d6d87da8edbf33b6a1b1 100644
--- a/terraform/common/function.tf
+++ b/terraform/common/function.tf
@@ -97,6 +97,7 @@ resource "google_cloudfunctions2_function" "holi-chat-integration-staging" {
       ENVIRONMENT                  = "staging"
       CHAT_OIDC_ISSUER             = "https://dev-auth.holi.social"
       CHAT_SERVER_URL              = "https://development-chat.holi.social"
+      CHAT_SERVER_NAME             = "development-chat.holi.social"
     }
     vpc_connector                  = data.terraform_remote_state.holi_infra_state.outputs.vpc_access_connector_name
     vpc_connector_egress_settings  = "PRIVATE_RANGES_ONLY"
@@ -154,6 +155,7 @@ resource "google_cloudfunctions2_function" "holi-chat-integration-staging" {
 #       ENVIRONMENT                  = "production"
 #       CHAT_OIDC_ISSUER             = "https://auth.holi.social"
 #       CHAT_SERVER_URL              = "https://chat.holi.social"
+#       CHAT_SERVER_NAME             = "chat.holi.social"
 #     }
 #     vpc_connector                  = data.terraform_remote_state.holi_infra_state.outputs.vpc_access_connector_name
 #     vpc_connector_egress_settings  = "PRIVATE_RANGES_ONLY"