diff --git a/lib/functions.sh b/lib/functions.sh
index a9404b2..423af1c 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -1068,8 +1068,8 @@ Password = "$ADMINPASS"
   <tr>
     <td class="tg-kwiq">Jitsi</td>
     <td class="tg-kwiq"><a href="https://jitsi.$DOMAIN/" target="_blank" rel="noopener noreferrer"><span style="color:#340096">jitsi.$DOMAIN</span></a></td>
-    <td class="tg-kwiq">admin<br>admin password above</td>
-    <td class="tg-kwiq">All users in panel have access using 'username'</td>
+    <td class="tg-kwiq">admin@$DOMAIN<br>admin password above</td>
+    <td class="tg-kwiq">All users in panel have access using user@$DOMAIN</td>
     <td class="tg-cul6"><a href="https://documentation.federated.computer/docs/core_applications/jitsi" target="_blank" rel="noopener noreferrer"><span style="color:#340096">Click here</span></a></td>
     <td class="tg-kwiq">Jitsi is a zoom replacement video conferencing solution</td>
   </tr>
diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index cc7dcff..4768983 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -278,6 +278,7 @@ services:
             ipv4_address: 172.99.0.26
             aliases:
               - xmpp.meet.jitsi
+              - xmpp.$DOMAIN
 
     # Focus component
     jicofo:
@@ -412,7 +413,14 @@ TZ=UTC
 
 # Public URL for the web service (required)
 PUBLIC_URL=https://jitsi.$DOMAIN
-#XMPP_DOMAIN=$DOMAIN
+XMPP_DOMAIN=$DOMAIN
+XMPP_AUTH_DOMAIN=auth.$DOMAIN
+XMPP_SERVER=xmpp.$DOMAIN
+XMPP_BOSH_URL_BASE=http://xmpp.$DOMAIN:5280
+XMPP_MUC_DOMAIN=muc.$DOMAIN
+XMPP_INTERNAL_MUC_DOMAIN=internal-muc.$DOMAIN
+XMPP_GUEST_DOMAIN=guest.$DOMAIN
+XMPP_RECORDER_DOMAIN=recorder.$DOMAIN
 
 # Media IP addresses to advertise by the JVB
 # This setting deprecates DOCKER_HOST_ADDRESS, and supports a comma separated list of IPs
@@ -660,8 +668,8 @@ Here is your applications chart with on how to access this service:<br>
   <tr>
     <td class="tg-kwiq">Jitsi</td>
     <td class="tg-kwiq"><a href="https://jitsi.$DOMAIN" target="_blank" rel="noopener noreferrer"><span style="color:#340096">jitsi.$DOMAIN</span></a></td>
-    <td class="tg-kwiq">admin<br>admin password above</td>
-    <td class="tg-kwiq">All users in panel have access using 'username'</td>
+    <td class="tg-kwiq">admin@$DOMAIN<br>admin password above</td>
+    <td class="tg-kwiq">All users in panel have access using user@$DOMAIN</td>
     <td class="tg-kwiq"><a href="https://documentation.federated.computer/docs/getting_started/welcome/" target="_blank" rel="noopener noreferrer"><span style="color:#340096">Click here</span></a></td>
     <td class="tg-kwiq">Jitsi is a zoom replacement video conferencing solution</td>
   </tr>