diff --git a/host_vars/boeing.adm.crans.org.yml b/host_vars/boeing.adm.crans.org.yml
index 188f9c1e277fb2f27bd087289de661dc17e761c4..ef2880881c420fc78e6e1ec9b6f7461950d81387 100644
--- a/host_vars/boeing.adm.crans.org.yml
+++ b/host_vars/boeing.adm.crans.org.yml
@@ -7,9 +7,9 @@ loc_wireguard:
   tunnels:
     - name: "sputnik"
       listen_port: 51820
-      private_key: "{{ vault.wireguard_boeing_private_key }}"
+      private_key: "{{ vault.wireguard.boeing.privkey }}"
       peers:
-        - public_key: "{{ vault.wireguard_sputnik_public_key }}"
+        - public_key: "{{ vault.wireguard.sputnik.pubkey }}"
           allowed_ips:
             - "{{ query('ldap', 'ip', 'sputnik', 'adm') | ipv4 | first }}/32"
             - "{{ query('ldap', 'ip', 'sputnik', 'adm') | ipv6 | first }}/128"
diff --git a/host_vars/sputnik.adm.crans.org.yml b/host_vars/sputnik.adm.crans.org.yml
index c8e7983bcf709b4849d5853eaacd87e5ce6063e6..0214a0f97f8e8400bfcbe8edc566ba4cd4768c92 100644
--- a/host_vars/sputnik.adm.crans.org.yml
+++ b/host_vars/sputnik.adm.crans.org.yml
@@ -15,9 +15,9 @@ loc_wireguard:
         - "{{ query('ldap', 'ip', 'sputnik', 'adm') | ipv4 | first }}/24"
         - "{{ query('ldap', 'ip', 'sputnik', 'adm') | ipv6 | first }}/64"
       listen_port: 51820
-      private_key: "{{ vault.wireguard_sputnik_private_key }}"
+      private_key: "{{ vault.wireguard.sputnik.privkey }}"
       peers:
-        - public_key: "{{ vault.wireguard_boeing_public_key }}"
+        - public_key: "{{ vault.wireguard.boeing.pubkey }}"
           allowed_ips:
             - "{{ query('ldap', 'network', 'adm') }}"
             - "fd00:0:0:{{ query('ldap', 'vlanid', 'adm') }}::/64"
diff --git a/host_vars/vol447.adm.crans.org.yml b/host_vars/vol447.adm.crans.org.yml
index dd9dbf36d8f03658266899274070b6a8323d9908..b2a2b2eba19f1dfd87d80a890e2608f8d7117eb5 100644
--- a/host_vars/vol447.adm.crans.org.yml
+++ b/host_vars/vol447.adm.crans.org.yml
@@ -7,9 +7,9 @@ loc_wireguard:
   tunnels:
     - name: "gulp"
       listen_port: 51820
-      private_key: "{{ vault.wireguard_vol447_private_key }}"
+      private_key: "{{ vault.wireguard.vol447.privkey }}"
       peers:
-        - public_key: "{{ vault.wireguard_charybde_public_key }}"
+        - public_key: "{{ vault.wireguard.charybde.pubkey }}"
           allowed_ips:
             - "{{ query('ldap', 'ip', 'charybde', 'adm') | ipv4 | first }}/32"
             - "{{ query('ldap', 'ip', 'charybde', 'adm') | ipv6 | first }}/128"