diff --git a/lib/files/jitsi/gen-passwords.sh b/lib/files/jitsi/gen-passwords.sh
index 29aec9b..f2d8b0a 100755
--- a/lib/files/jitsi/gen-passwords.sh
+++ b/lib/files/jitsi/gen-passwords.sh
@@ -5,7 +5,11 @@ function generatePassword() {
 }
 
 JICOFO_AUTH_PASSWORD=$(generatePassword)
-JVB_AUTH_PASSWORD=$(generatePassword)
+if [ -n "$JITSI_SCALE" ]; then
+	JVB_AUTH_PASSWORD="J17515cAl3-jvb"
+else
+	JVB_AUTH_PASSWORD=$(generatePassword)
+fi
 JIGASI_XMPP_PASSWORD=$(generatePassword)
 JIBRI_RECORDER_PASSWORD=$(generatePassword)
 JIBRI_XMPP_PASSWORD=$(generatePassword)
diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index 7cc9b64..616a458 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -25,6 +25,10 @@ cat > /federated/apps/jitsi/docker-compose.yml <<EOF
 version: '3.7'
 
 services:
+EOF
+
+if [ "$JITSI_SCALE" != "server" ]; then
+	cat >> /federated/apps/jitsi/docker-compose.yml <<EOF
     # Frontend
     web:
         image: jitsi/web:\${JITSI_IMAGE_VERSION:-stable-9779}
@@ -328,6 +332,10 @@ services:
           core:
             ipv4_address: 192.168.0.27
 
+EOF
+fi
+if [ "$JITSI_SCALE" != "client" ]; then
+	cat >> /federated/apps/jitsi/docker-compose.yml <<EOF
     # Video bridge
     jvb:
         image: jitsi/jvb:\${JITSI_IMAGE_VERSION:-stable-9779}
@@ -372,6 +380,10 @@ services:
         networks:
           core:
             ipv4_address: 192.168.0.28
+EOF
+fi
+
+cat >> /federated/apps/jitsi/docker-compose.yml <<EOF
 
 networks:
   core: