diff --git a/roles/wg_hub/molecule/default/converge.yml b/roles/wg_hub/molecule/default/converge.yml
index e807dae..f9ba525 100644
--- a/roles/wg_hub/molecule/default/converge.yml
+++ b/roles/wg_hub/molecule/default/converge.yml
@@ -11,13 +11,13 @@
     wg_hub_hide_secrets: false
     # dns_server: 127.0.0.1:5300  # doesn't work in Github Actions environment
     peers:
-      - wg_hub_host_id: alpha
-        wg_hub_ipv4_vpn_addr: 10.0.0.1
-        wg_hub_wg_pubkey: LfEJgNiJ05nx4nWB0Pj3wS3WRyFq567fsdDh4XZqRF0=
+      - host_id: alpha
+        ipv4_vpn_addr: 10.0.0.1
+        wg_pubkey: LfEJgNiJ05nx4nWB0Pj3wS3WRyFq567fsdDh4XZqRF0=
         wg_psk: i3JCrQOfptZhgpL+BTm/65MPW/ljJexCgiuWMIqZJYo=
-      - wg_hub_host_id: beta
-        wg_hub_ipv4_vpn_addr: 10.0.0.2
-        wg_hub_wg_pubkey: oq3Fcwwfxsi5f5UHcZKtxMwQ2aSeHOUe3r35soUUYzU=
+      - host_id: beta
+        ipv4_vpn_addr: 10.0.0.2
+        wg_pubkey: oq3Fcwwfxsi5f5UHcZKtxMwQ2aSeHOUe3r35soUUYzU=
         wg_psk: Z/z7Qo8hW97UcImYE/ZbCxpNmizfVhvl0dzygtvtYYg=
 
   roles:
diff --git a/roles/wg_hub/tasks/main.yml b/roles/wg_hub/tasks/main.yml
index 78551ea..1734a21 100644
--- a/roles/wg_hub/tasks/main.yml
+++ b/roles/wg_hub/tasks/main.yml
@@ -29,7 +29,7 @@
 
       PreUp = sysctl -w net.ipv4.ip_forward=1
       {% if dns_server is defined %}
-      PostUp = resolvectl dns %i {{ dns_server }}; resolvectl domain %i {{ wg_hub_iface_name }}.local
+      PostUp = resolvectl dns %i {{ wg_hub_dns_server }}; resolvectl domain %i {{ wg_hub_iface_name }}.local
       {% endif %}
       PostDown = sysctl -w net.ipv4.ip_forward=0
 
@@ -38,7 +38,7 @@
   notify: "Run the Wireguard service"
   loop: "{{ peers }}"
   vars:
-    domain_name: "{{ item.wg_hub_host_id }}.{{ wg_hub_iface_name }}.local"
+    domain_name: "{{ item.host_id }}.{{ wg_hub_iface_name }}.local"
   ansible.builtin.blockinfile:
     path: "/etc/wireguard/{{ wg_hub_iface_name }}.conf"
     owner: root
@@ -48,7 +48,7 @@
     block: |
       #
       [Peer]  # {{ domain_name }}
-      PublicKey = {{ item.wg_hub_wg_pubkey }}
+      PublicKey = {{ item.wg_pubkey }}
       PresharedKey = {{ item.wg_psk }}
-      AllowedIPs = {{ item.wg_hub_ipv4_vpn_addr }}/32
+      AllowedIPs = {{ item.ipv4_vpn_addr }}/32
       #