diff --git a/heat/server.sls b/heat/server.sls
index 0e24331..b247463 100644
--- a/heat/server.sls
+++ b/heat/server.sls
@@ -19,6 +19,14 @@
   - require:
     - pkg: heat_server_packages
 
+heat_client_roles:
+  keystone.role_present:
+  - names:
+    - heat_stack_owner
+    - heat_stack_user
+  - require:
+    - pkg: heat_server_packages
+
 {%- if server.version != 'juno' %}
 
 heat_keystone_setup: