diff --git a/roles/custom/matrix-admin-wireguard/templates/wg0.conf.j2 b/roles/custom/matrix-admin-wireguard/templates/wg0.conf.j2
new file mode 100644
index 000000000..759d2db69
--- /dev/null
+++ b/roles/custom/matrix-admin-wireguard/templates/wg0.conf.j2
@@ -0,0 +1,11 @@
+[Interface]
+Address = {{ tawkie_wireguard_admin_conf_interface_ip }}/24
+PrivateKey = {{ tawkie_wireguard_admin_conf_interface_private_key }}
+
+[Peer]
+PublicKey = {{ tawkie_wireguard_admin_conf_peer_public_key }}
+AllowedIPs = {{ tawkie_wireguard_admin_conf_peer_ip }}/32
+Endpoint = {{ tawkie_wireguard_admin_conf_peer_endpoint }}
+# Without keep-alive the transverse server can't reach the matrix server
+PersistentKeepalive = 10
+
diff --git a/roles/custom/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 b/roles/custom/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2
index f00c5b57c..bb5fa7db5 100755
--- a/roles/custom/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2
+++ b/roles/custom/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2
@@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			-p {{ matrix_nginx_proxy_container_http_host_bind_port }}:8080 \
 			{% endif %}
 			{% if matrix_admin_wireguard_enabled %}
-			-p {{ matrix_admin_wireguard_ip }}:{{ matrix_admin_wireguard_port }}:8090 \
+			-p {{ tawkie_wireguard_admin_conf_interface_ip }}:{{ matrix_admin_wireguard_port }}:8090 \
 			{% endif %}
 			{% if matrix_nginx_proxy_https_enabled and matrix_nginx_proxy_container_https_host_bind_port %}
 			-p {{ matrix_nginx_proxy_container_https_host_bind_port }}:8443 \