diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index e35f1a3..fa98d8e 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -449,17 +449,17 @@ TZ=UTC
 PUBLIC_URL=https://jitsi.$DOMAIN
 EOF
 
-if [ -n "$JITSI_SCALE" ]; then
-	if [ "$JITSI_SCALE" = "server" ]; then
-		cat >> /federated/apps/jitsi/.env <<EOF
-XMPP_SERVER=xmpp.jitsitest.federatedcomputer.cloud
+if [ "$JITSI_SCALE" = "server" ]; then
+	cat >> /federated/apps/jitsi/.env <<EOF
+XMPP_SERVER=xmpp.jitsitest.federatedcomputer.cloud,xmpp.jitsitest2.fedcom.net
 EOF
-	else
-		cat >> /federated/apps/jitsi/.env <<EOF
+else
+	cat >> /federated/apps/jitsi/.env <<EOF
 XMPP_SERVER=xmpp.$DOMAIN
 EOF
-	fi
+fi
 
+if [ -n "$JITSI_SCALE" ]; then
 	# XMPP_AUTH_DOMAIN and XMPP_INTERNAL_MUC_DOMAIN don't
 	# need to resolve - they just need to be identical across
 	# the involved Jitsi components.
@@ -471,20 +471,20 @@ EOF
 XMPP_AUTH_DOMAIN=auth.jitsiscale.federated.computer
 XMPP_INTERNAL_MUC_DOMAIN=internal-muc.jitsiscale.federated.computer
 EOF
+else
+	cat >> /federated/apps/jitsi/.env <<EOF
+XMPP_AUTH_DOMAIN=auth.$DOMAIN
+XMPP_INTERNAL_MUC_DOMAIN=internal-muc.$DOMAIN
+EOF
+fi
 
-	if [ "$JITSI_SCALE" = "server" ]; then
-		cat >> /federated/apps/jitsi/.env <<EOF
+if [ "$JITSI_SCALE" = "server" ]; then
+	cat >> /federated/apps/jitsi/.env <<EOF
 
 # XMPP password for JVB client connections
 JVB_AUTH_PASSWORD=
 EOF
-	fi
 else
-	cat >> /federated/apps/jitsi/.env <<EOF
-XMPP_SERVER=xmpp.$DOMAIN
-XMPP_AUTH_DOMAIN=auth.$DOMAIN
-XMPP_INTERNAL_MUC_DOMAIN=internal-muc.$DOMAIN
-EOF
 
 	cat >> /federated/apps/jitsi/.env <<EOF
 XMPP_DOMAIN=$DOMAIN