diff --git a/collectd/client.sls b/collectd/client.sls
index eca7071..d7f11b2 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -14,7 +14,8 @@
 
 {%- set service_grains = {'collectd': {'remote_plugin': {}, 'local_plugin': {}}} %}
 
-{%- for service_name, service in pillar.items() %}
+{%- for service_name in salt['pillar.ls']()|sort %}
+{%- set service = salt['pillar.items'](service_name)[service_name] %}
 {%- if service.get('_support', {}).get('collectd', {}).get('enabled', False) %}
 
 {%- set grains_fragment_file = service_name+'/meta/collectd.yml' %}