diff --git a/dashboard/backend/config.py b/dashboard/backend/config.py
index 0fa176e..cbdf222 100644
--- a/dashboard/backend/config.py
+++ b/dashboard/backend/config.py
@@ -41,7 +41,7 @@ TELEGRAM_BOT_TOKEN = os.environ.get("TELEGRAM_BOT_TOKEN", "")
 TELEGRAM_CHAT_ID = os.environ.get("TELEGRAM_CHAT_ID", "")
 TELEGRAM_PROXY = os.environ.get("TELEGRAM_PROXY", "")
 
-WEBAUTHN_RP_ID = os.environ.get("WEBAUTHN_RP_ID", "nas.jimmygan.com")
+WEBAUTHN_RP_ID = os.environ.get("WEBAUTHN_RP_ID", "jimmygan.com")
 WEBAUTHN_ORIGINS = os.environ.get("WEBAUTHN_ORIGINS", "https://nas.jimmygan.com,https://nas.jimmygan.com:8443").split(",")
 
 # CORS
diff --git a/dashboard/docker-compose.dev.yml b/dashboard/docker-compose.dev.yml
index 7b2451d..caaac37 100644
--- a/dashboard/docker-compose.dev.yml
+++ b/dashboard/docker-compose.dev.yml
@@ -25,8 +25,8 @@ services:
       - TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-}
       - TELEGRAM_PROXY=${TELEGRAM_PROXY:-}
       - CORS_ORIGINS=https://dev.nas.jimmygan.com,https://dev.nas.jimmygan.com:8443
-      - WEBAUTHN_RP_ID=nas.jimmygan.com
-      - WEBAUTHN_ORIGINS=https://dev.nas.jimmygan.com,https://dev.nas.jimmygan.com:8443
+      - WEBAUTHN_RP_ID=jimmygan.com
+      - WEBAUTHN_ORIGINS=https://dev.nas.jimmygan.com,https://dev.nas.jimmygan.com:8443,https://auth.jimmygan.com:8443
       - LITELLM_URL=http://litellm:4005
       - LITELLM_HEALTH_API_KEY=${LITELLM_HEALTH_API_KEY:-}
     volumes:
diff --git a/dashboard/docker-compose.yml b/dashboard/docker-compose.yml
index 7820e4c..2c1b74b 100644
--- a/dashboard/docker-compose.yml
+++ b/dashboard/docker-compose.yml
@@ -47,8 +47,8 @@ services:
       - TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-}
       - TELEGRAM_PROXY=${TELEGRAM_PROXY:-}
       - CORS_ORIGINS=https://nas.jimmygan.com
-      - WEBAUTHN_RP_ID=nas.jimmygan.com
-      - WEBAUTHN_ORIGINS=https://nas.jimmygan.com
+      - WEBAUTHN_RP_ID=jimmygan.com
+      - WEBAUTHN_ORIGINS=https://nas.jimmygan.com,https://auth.jimmygan.com:8443
       - LITELLM_HEALTH_API_KEY=${LITELLM_HEALTH_API_KEY:-}
       - LITELLM_URL=http://litellm:4005
     volumes: