diff --git a/heka/_service.sls b/heka/_service.sls
index 6e058da..86fd5b6 100644
--- a/heka/_service.sls
+++ b/heka/_service.sls
@@ -30,6 +30,8 @@
   - source: salt://heka/files/heka.service
   - user: root
   - mode: 644
+  - defaults:
+    service_name: {{ service_name }}
   - template: jinja
 
 {%- else %}
@@ -107,7 +109,7 @@
 {%- for service_name, service in pillar.iteritems() %}
 {%- if service.get('_support', {}).get('heka', {}).get('enabled', False) %}
 
-{%- macro load_grains_file(grains_fragment_file) %}{% include grains_fragment_file %}{% endmacro %}
+{%- macro load_grains_file(grains_fragment_file) %}{% include grains_fragment_file ignore missing %}{% endmacro %}
 
 {%- set grains_fragment_file = service_name+'/meta/heka.yml' %}
 {%- set grains_yaml = load_grains_file(grains_fragment_file)|load_yaml %}