diff --git a/roles/dispatch/README.md b/roles/dispatch/README.md
index 8a302903a..57b2c3ebc 100644
--- a/roles/dispatch/README.md
+++ b/roles/dispatch/README.md
@@ -11,7 +11,7 @@ Each role has its own variables, for information on those please see each role w
 ```yaml
 gateway_dispatch_roles:
   - {role: settings, var: settings_list, tags: settings}
-  - {role: users, var: users_list, tags: users}
+  - {role: users, var: aap_user_accounts, tags: users}
   - {role: authenticators, var: authenticators_list, tags: authenticators}
   - {role: authenticator_maps, var: authenticator_maps_list, tags: authenticator_maps}
   - {role: http_ports, var: http_ports_list, tags: http_ports}
diff --git a/roles/gateway_users/tasks/main.yml b/roles/gateway_users/tasks/main.yml
index 1afeb1521..44adcae73 100644
--- a/roles/gateway_users/tasks/main.yml
+++ b/roles/gateway_users/tasks/main.yml
@@ -21,7 +21,7 @@
     gateway_token: "{{ aap_token | default(omit, true) }}"
     gateway_request_timeout: "{{ aap_request_timeout | default(omit, true) }}"
     gateway_validate_certs: "{{ aap_validate_certs | default(omit) }}"
-  loop: "{{ users if users is defined else users_list }}"
+  loop: "{{ aap_user_accounts }}"
   loop_control:
     loop_var: __gateway_user_accounts_item
     label: "{{ __operation.verb }} the label {{ __gateway_user_accounts_item.name }} to Controller"
diff --git a/tests/configs/user_accounts.yml b/tests/configs/user_accounts.yml
index cedaa79ad..0168e926f 100644
--- a/tests/configs/user_accounts.yml
+++ b/tests/configs/user_accounts.yml
@@ -1,5 +1,5 @@
 ---
-users_list:
+aap_user_accounts:
   - user: controller_user
     is_superuser: false
     password: aap_password