diff --git a/collectd/client.sls b/collectd/client.sls
index 55be5cb..7affb98 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -14,8 +14,7 @@
 
 {%- set service_grains = {'collectd': {'remote_plugin': {}, 'local_plugin': {}}} %}
 
-{%- for service_name in pillar.keys()|sort %}
-  {%- set service = salt['pillar.items'](service_name)[service_name] %}
+{%- for service_name, service in pillar.items() %}
   {%- if service.get('_support', {}).get('collectd', {}).get('enabled', False) %}
     {%- set grains_fragment_file = service_name+'/meta/collectd.yml' %}
     {%- macro load_grains_file() %}{% include grains_fragment_file ignore missing %}{% endmacro %}
diff --git a/collectd/meta/salt.yml b/collectd/meta/salt.yml
index 7266f7f..534b240 100644
--- a/collectd/meta/salt.yml
+++ b/collectd/meta/salt.yml
@@ -2,8 +2,7 @@
   {%- if pillar.collectd.client is defined %}
     {%- set service_grains = {'collectd': {'remote_plugin': {}, 'local_plugin': {}}} %}
 
-    {%- for service_name in pillar.keys|sort %}
-      {%- set service = salt['pillar.items'](service_name)[service_name] %}
+    {%- for service_name, service in pillar.items() %}
       {%- if service.get('_support', {}).get('collectd', {}).get('enabled', False) %}
         {%- set grains_fragment_file = service_name+'/meta/collectd.yml' %}
         {%- macro load_grains_file() %}{% include grains_fragment_file ignore missing %}{% endmacro %}