diff --git a/heat/server.sls b/heat/server.sls
index f9622d0..4c36d65 100644
--- a/heat/server.sls
+++ b/heat/server.sls
@@ -39,6 +39,8 @@
 
 {%- if not grains.get('virtual_subtype', None) == "Docker" %}
 
+{%- if not salt['pillar.get']('linux:system:repo:mirantis_openstack', False) %}
+
 heat_client_roles:
   keystone.role_present:
   - names:
@@ -51,6 +53,8 @@
   - require:
     - pkg: heat_server_packages
 
+{%- endif %}
+
 {%- if server.version != 'juno' %}
 
 heat_keystone_setup: