diff --git a/defaults/main.yml b/defaults/main.yml
index e13235c..79fdff6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,4 +8,4 @@ jitsi_exposed_https_port: 8443
 jitsi_virtual_host: localhost
 jitsi_public_url: http://{{ jitsi_virtual_host }}
 jitsi_timezone: Europe/Amsterdam
-jitsi_jvb_stun_servers: stun:stun.schlund.de:3478,stun:stun.t-online.de:3478,stun:stun.1und1.de:3478
\ No newline at end of file
+jitsi_jvb_stun_servers: meet-jit-si-turnrelay.jitsi.net:443
\ No newline at end of file
diff --git a/templates/env.jitsi.j2 b/templates/env.jitsi.j2
index 3a2a843..efb7ab6 100644
--- a/templates/env.jitsi.j2
+++ b/templates/env.jitsi.j2
@@ -15,7 +15,7 @@ HTTPS_PORT={{ jitsi_exposed_https_port }}
 TZ={{ jitsi_timezone }}
 
 # Public URL for the web service.
-PUBLIC_URL="{{ jitsi_public_url }}"
+PUBLIC_URL={{ jitsi_public_url }}
 VIRTUAL_HOST={{ jitsi_virtual_host }}
 
 # IP address of the Docker host. See the "Running on a LAN environment" section