diff --git a/roles/wireguard_server/templates/wireguardserver.conf b/roles/wireguard_server/templates/wireguardserver.conf
index 2961ba9..e9c486e 100644
--- a/roles/wireguard_server/templates/wireguardserver.conf
+++ b/roles/wireguard_server/templates/wireguardserver.conf
@@ -1,13 +1,13 @@
 [Interface]
-PrivateKey = {{ wireguard-server-vault.key }}
+PrivateKey = {{ vars['wireguard-server-vault']['key'] }}
 Address=10.0.0.1/24
 PostUp=iptables -A FORWARD -i wireguardserver -o ens18 -j ACCEPT; iptables -A FORWARD -i ens18 -o wireguardserver -j ACCEPT; iptables -t nat -A POSTROUTING -o ens18 -j MASQUERADE;
 PostDown=iptables -D FORWARD -i wireguardserver -o ens18 -j ACCEPT; iptables -D FORWARD -i ens18 -o wireguardserver -j ACCEPT; iptables -t nat -D POSTROUTING -o ens18 -j MASQUERADE;
-ListenPort={{ wireguard-server.internal-port }}
+ListenPort={{ vars['wireguard-server']['internal-port'] }}
 
-{% for user in wireguard-client %}
+{% for client_name, client_data in vars['wireguard-client'].items() %}
 [Peer]
-PublicKey = {{ wireguard-client-vault.user.pub }}
-AllowedIPs = {{ wireguard-client.user.ip }}/32
-
+# {{ client_name }}
+PublicKey = {{ vars['wireguard-client-vault'][client_name]['pub'] }}
+AllowedIPs = {{ client_data.ip }}/32
 {% endfor %}