diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index 7a0cd4d..203a750 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -440,6 +440,19 @@ TZ=UTC
 
 # Public URL for the web service (required)
 PUBLIC_URL=https://jitsi.$DOMAIN
+EOF
+
+if [ "$JITSI_SCALE" = "server" ]; then
+	cat >> /federated/apps/jitsi/.env <<EOF
+XMPP_AUTH_DOMAIN=auth.jitsitest.federatedcomputer.cloud
+XMPP_SERVER=xmpp.jitsitest.federatedcomputer.cloud
+XMPP_INTERNAL_MUC_DOMAIN=internal-muc.jitsitest.federatedcomputer.cloud
+
+# XMPP password for JVB client connections
+JVB_AUTH_PASSWORD=
+EOF
+else
+	cat >> /federated/apps/jitsi/.env <<EOF
 XMPP_DOMAIN=$DOMAIN
 XMPP_AUTH_DOMAIN=auth.$DOMAIN
 XMPP_SERVER=xmpp.$DOMAIN
@@ -480,6 +493,12 @@ XMPP_RECORDER_DOMAIN=recorder.$DOMAIN
 # Use the staging server (for avoiding rate limits while testing)
 #LETSENCRYPT_USE_STAGING=1
 
+#
+# Client options
+#
+ENABLE_SIMULCAST=false
+ENABLE_RECORDING=1
+ENABLE_LIVESTREAMING=1
 
 #
 # Etherpad integration (for document sharing)
@@ -624,6 +643,10 @@ JIBRI_RECORDER_PASSWORD=
 
 # XMPP password for Jibri client connections
 JIBRI_XMPP_PASSWORD=
+EOF
+fi
+
+cat >> /federated/apps/jitsi/.env <<EOF
 
 #
 # Docker Compose options
@@ -634,9 +657,6 @@ JIBRI_XMPP_PASSWORD=
 
 # Jitsi image version (useful for local development)
 JITSI_IMAGE_VERSION=stable-9779
-ENABLE_SIMULCAST=false
-ENABLE_RECORDING=1
-ENABLE_LIVESTREAMING=1
 EOF
 
 mkdir -p /federated/apps/jitsi/data/config/{web,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri}