diff --git a/tasks/heat_service_setup.yml b/tasks/heat_service_setup.yml
index 72e439d..52d51b6 100644
--- a/tasks/heat_service_setup.yml
+++ b/tasks/heat_service_setup.yml
@@ -119,7 +119,8 @@
         state: present
         user: "{{ item.user }}"
         role: "{{ item.role }}"
-        project: "{{ item.project }}"
+        project: "{{ item.project | default(omit) }}"
+        domain: "{{ item.domain | default(omit) }}"
         endpoint_type: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       register: add_service
@@ -143,7 +144,7 @@
           project: "{{ heat_service_project_name }}"
         - user: "{{ heat_stack_domain_admin }}"
           role: "{{ keystone_role_name | default('admin') }}"
-          project: "{{ heat_project_name }}"
+          domain: "{{ add_stack_user_domain.id }}"
 
     - name: Add endpoints to keystone endpoint catalog
       os_keystone_endpoint: