diff --git a/pillar/top.sls b/pillar/top.sls
index 872dc8b..3302bd8 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -4,11 +4,9 @@
 {{ saltenv }}:
   '*':
     - common
-  {% for role in roles %}
-  'roles:{{ role }}':
-    - match: grain
-    - role.{{ role }}
-  {%- endfor %}
   '{{ id }}':
     - ignore_missing: True
     - id.{{ id.replace('.', '_') }}
+  {% for role in roles %}
+    - role.{{ role }}
+  {%- endfor %}
diff --git a/salt/top.sls b/salt/top.sls
index a534cc5..632d4a2 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -4,8 +4,9 @@
 {{ saltenv }}:
   '*':
     - common
+  {%- if roles | length > 0 %}
+  '{{ id }}':
   {% for role in roles %}
-  'roles:{{ role }}':
-    - match: grain
     - role.{{ role }}
-  {% endfor %}
+  {%- endfor %}
+  {%- endif %}