diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml
index 60112159c7..70ee29f981 100644
--- a/ansible/roles/heat/tasks/register.yml
+++ b/ansible/roles/heat/tasks/register.yml
@@ -47,10 +47,10 @@
     -m os_keystone_role
     -a "name={{ heat_stack_user_role }}
         auth={{ '{{ openstack_heat_auth }}' }}"
-    -e "{'openstack_horizon_auth':{{ openstack_heat_auth }}}"
+    -e "{'openstack_heat_auth':{{ openstack_heat_auth }}}"
   register: heat_stack_user_role_result
-  changed_when: "{{ heat_stack_user_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_user_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: heat_stack_user_result.split()[2] == 'SUCCESS'
+  changed_when: "{{ heat_stack_user_role_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_user_role_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+  until: heat_stack_user_role_result.stdout.split()[2] == 'SUCCESS'
   retries: 10
   delay: 5
   run_once: True
@@ -60,10 +60,10 @@
     -m os_keystone_role
     -a "name={{ heat_stack_owner_role }}
         auth={{ '{{ openstack_heat_auth }}' }}"
-    -e "{'openstack_horizon_auth':{{ openstack_heat_auth }}}"
+    -e "{'openstack_heat_auth':{{ openstack_heat_auth }}}"
   register: heat_stack_owner_role_result
-  changed_when: "{{ heat_stack_owner_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_owner_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: heat_stack_owner_result.split()[2] == 'SUCCESS'
+  changed_when: "{{ heat_stack_owner_role_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_owner_role_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+  until: heat_stack_owner_role_result.stdout.split()[2] == 'SUCCESS'
   retries: 10
   delay: 5
   run_once: True