diff --git a/.env b/.env
index 1ca5d5fc4e..3bef66f414 100644
--- a/.env
+++ b/.env
@@ -10,6 +10,7 @@ _APP_CONSOLE_SESSION_ALERTS=enabled
 _APP_CONSOLE_WHITELIST_IPS=
 _APP_CONSOLE_COUNTRIES_DENYLIST=AQ
 _APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io
+_APP_HOSTNAMES=appwrite
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io
 _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
diff --git a/app/config/platform.php b/app/config/platform.php
index ef8f786f6c..60ad8f4445 100644
--- a/app/config/platform.php
+++ b/app/config/platform.php
@@ -22,7 +22,7 @@ return [
     'hostnames' => array_filter(array_unique([
         System::getEnv('_APP_DOMAIN', 'localhost'),
         System::getEnv('_APP_CONSOLE_DOMAIN', 'localhost'),
-        'appwrite',
+        ...explode(',', System::getEnv('_APP_HOSTNAMES', '')),
     ])),
     'platformName' => APP_EMAIL_PLATFORM_NAME,
     'logoUrl' => APP_EMAIL_LOGO_URL,
diff --git a/docker-compose.yml b/docker-compose.yml
index 0eee94a999..4a0875c5f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -228,6 +228,7 @@ services:
       - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
       - _APP_CUSTOM_DOMAIN_DENY_LIST
       - _APP_TRUSTED_HEADERS
+      - _APP_HOSTNAMES
     extra_hosts:
       - "host.docker.internal:host-gateway"