diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 64439f1..775448d 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -8,9 +8,10 @@
     new_hetzner_server_image: debian-10
     new_hetzner_delete_protection: false
     new_hetzner_rebuild_protection: false
+    new_hetzner_user_accounts: files/members.yml
   pre_tasks:
     - name: Include resource variables
-      include_vars: files/members.yml
+      include_vars: "{{ new_hetzner_user_accounts }}"
   tasks:
     - name: Run the role under test
       block:
diff --git a/tasks/main.yml b/tasks/main.yml
index 8f12348..6b462d8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,13 +4,13 @@
     that: "{{ item }} is defined"
     fail_msg: "You must define the '{{ item }}' variable"
   with_items:
-    - members
+    - new_hetzner_user_accounts
     - new_hetzner_server_image
     - new_hetzner_server_name
     - new_hetzner_server_type
 
 - name: Include resource variables
-  include_vars: "{{ members }}"
+  include_vars: "{{ new_hetzner_user_accounts }}"
   tags:
     - molecule-notest
 
@@ -66,7 +66,7 @@
 
 - name: Run the add-users role on the new instance
   vars:
-    members: "{{ members }}"
+    add_users_user_accounts: "{{ new_hetzner_user_accounts }}"
   delegate_to: root-new-instance
   import_role:
     name: autonomic.add-users
@@ -74,6 +74,8 @@
     - molecule-notest
 
 - name: Run the sshd role on the new instance
+  vars:
+    sshd_user_accounts: "{{ new_hetzner_user_accounts }}"
   delegate_to: root-new-instance
   import_role:
     name: autonomic.sshd