diff --git a/deploy_matrix.yml b/deploy_matrix.yml
index f224218..afe1e8b 100644
--- a/deploy_matrix.yml
+++ b/deploy_matrix.yml
@@ -1,5 +1,5 @@
 ---
-- name: Deploy Matrix + TURN + Traefik + NGINX + Teamspeak
+- name: Deploy Matrix + TURN + NGINX-PM + Teamspeak
   hosts: all
   become: true
   collections:
diff --git a/templates/homeserver.yaml.j2 b/templates/homeserver.yaml.j2
index 9f08cce..2c82a2e 100644
--- a/templates/homeserver.yaml.j2
+++ b/templates/homeserver.yaml.j2
@@ -11,11 +11,12 @@ listeners:
     type: http
     x_forwarded: true
 
+
 turn_uris:
-    - "turn:{{ matrix_container_name }}:{{ turn_listen_port }}?transport=udp"
-    - "turn:{{ matrix_container_name }}:{{ turn_tls_port }}?transport=tcp"
-    - "turns:{{ matrix_container_name }}:{{ turn_tls_port }}?transport=tcp"
-    - "turns:{{ matrix_container_name }}:{{ turn_listen_port }}?transport=udp"
+    - "turn:{{ turn_domain }}:{{ turn_listen_port }}?transport=udp"
+    - "turn:{{ turn_domain }}:{{ turn_tls_port }}?transport=tcp"
+    - "turns:{{ turn_domain }}:{{ turn_tls_port }}?transport=tcp"
+    - "turns:{{ turn_domain }}:{{ turn_listen_port }}?transport=udp"
 
 turn_shared_secret: "{{ turn_secret }}"
 turn_user_lifetime: "1h"