diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index 203a750..63a946e 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -429,12 +429,19 @@ cat > /federated/apps/jitsi/.env <<EOF
 # Directory where all configuration will be stored
 CONFIG=/federated/apps/jitsi/data/config
 
+EOF
+if [ "$JITSI_SCALE" != "server" ]; then
+cat >> /federated/apps/jitsi/.env <<EOF
 # Exposed HTTP port
 HTTP_PORT=9000
 
 # Exposed HTTPS port
 HTTPS_PORT=9443
 
+EOF
+fi
+
+cat >> /federated/apps/jitsi/.env <<EOF
 # System time zone
 TZ=UTC
 
@@ -442,23 +449,47 @@ TZ=UTC
 PUBLIC_URL=https://jitsi.$DOMAIN
 EOF
 
-if [ "$JITSI_SCALE" = "server" ]; then
-	cat >> /federated/apps/jitsi/.env <<EOF
-XMPP_AUTH_DOMAIN=auth.jitsitest.federatedcomputer.cloud
+if [ -n "$JITSI_SCALE" ]; then
+	if [ "$JITSI_SCALE" = "server" ]; then
+		cat >> /federated/apps/jitsi/.env <<EOF
 XMPP_SERVER=xmpp.jitsitest.federatedcomputer.cloud
-XMPP_INTERNAL_MUC_DOMAIN=internal-muc.jitsitest.federatedcomputer.cloud
+EOF
+	else
+		cat >> /federated/apps/jitsi/.env <<EOF
+XMPP_SERVER=xmpp.$DOMAIN
+EOF
+	fi
+
+	# XMPP_AUTH_DOMAIN and XMPP_INTERNAL_MUC_DOMAIN don't
+	# need to resolve - they just need to be identical across
+	# the involved Jitsi components.
+	# So it is safe to use a common (even if nonexistant)
+	# domain across all Jitsi Scale clients so the JVB can
+	# use the same information for every Prosody instance
+	# it connects to.
+	cat >> /federated/apps/jitsi/.env <<EOF
+XMPP_AUTH_DOMAIN=auth.jitsiscale.federated.computer
+XMPP_INTERNAL_MUC_DOMAIN=internal-muc.jitsiscale.federated.computer
+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_DOMAIN=$DOMAIN
-XMPP_AUTH_DOMAIN=auth.$DOMAIN
 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
 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