diff --git a/roles/matrix-jitsi/defaults/main.yml b/roles/matrix-jitsi/defaults/main.yml
index c8d0657c7..3ec5d9a1b 100644
--- a/roles/matrix-jitsi/defaults/main.yml
+++ b/roles/matrix-jitsi/defaults/main.yml
@@ -229,6 +229,7 @@ matrix_jitsi_jvb_stun_servers: ['meet-jit-si-turnrelay.jitsi.net:443']
 matrix_jitsi_jvb_brewery_muc: jvbbrewery
 matrix_jitsi_jvb_rtp_udp_port: 10000
 matrix_jitsi_jvb_rtp_tcp_port: 4443
+matrix_jitsi_jvb_public_ip: ''
 
 # Custom configuration to be injected into `custom-sip-communicator.properties`, passed to Jitsi JVB.
 # This configuration gets appended to the final configuration that Jitsi JVB uses.
diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2
index 54b8ea436..4f83e7a2f 100644
--- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2
@@ -54,6 +54,20 @@
 		tcp_nodelay on;
 	}
 
+	# colibri (JVB) websockets for additional JVBs
+    location ~ ^/colibri-ws/([0-9.]*)/(.*) {
+        proxy_pass http://$1:9090/colibri-ws/$1/$2$is_args$args;
+
+		proxy_set_header Host $host;
+		proxy_set_header X-Forwarded-For {{ matrix_nginx_proxy_x_forwarded_for }};		
+		proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+	    proxy_http_version 1.1;
+
+        tcp_nodelay on;
+	}
+
 	# XMPP websocket
 	location = /xmpp-websocket {
 		{% if matrix_nginx_proxy_enabled %}