diff --git a/heka/_service.sls b/heka/_service.sls
index 3070185..18bfc0b 100644
--- a/heka/_service.sls
+++ b/heka/_service.sls
@@ -89,25 +89,6 @@
 {%- endif %}
   - name: {{ service_name }}
 
-{%- if service_name in ('remote_collector', 'aggregator') %}
-
-{# Load the other services' support metadata from salt-mine #}
-
-{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
-{%- if node_grains.heka is defined %}
-{% for service, data in node_grains.heka.items() %}
-  {%- if service in ('remote_collector', 'aggregator') %}
-    {%- do salt['grains.filter_by']({'default': service_grains[service]}, merge=data) %}
-  {%- endif %}
-{% endfor %}
-{% endif %}
-{%- endfor %}
-
-{%- endif %}
-
-
-{# Overriding aggregated metadata from user-space pillar data #}
-
 {# Setup basic structure for all roles so updates can apply #}
 {%- set service_grains = {
   'log_collector': {
@@ -159,6 +140,24 @@
   }
 } %}
 
+{%- if service_name in ('remote_collector', 'aggregator') %}
+
+{# Load the other services' support metadata from salt-mine #}
+
+{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
+{%- if node_grains.heka is defined %}
+{% for service, data in node_grains.heka.items() %}
+  {%- if service in ('remote_collector', 'aggregator') %}
+    {%- do salt['grains.filter_by']({'default': service_grains[service]}, merge=data) %}
+  {%- endif %}
+{% endfor %}
+{% endif %}
+{%- endfor %}
+
+{%- endif %}
+
+{# Overriding aggregated metadata from user-space pillar data #}
+
 {# Loading the other services' support metadata for local roles #}
 {%- macro load_support_file(support_fragment_file) %}{% include support_fragment_file ignore missing %}{% endmacro %}
 {%- for svc_name, svc in pillar.iteritems() %}