diff --git a/heka/files/decoder/sandbox.toml b/heka/files/decoder/sandbox.toml
index 8c0c9fb..053b475 100644
--- a/heka/files/decoder/sandbox.toml
+++ b/heka/files/decoder/sandbox.toml
@@ -1,6 +1,6 @@
 [Sandbox_{{ name }}]
 type = "SandboxDecoder"
-file_name = "{{ values.file_name }}"
+filename = "{{ values.file_name }}"
 
 {% if values.module_directory is defined %}
 module_directory =  "{{ values.module_directory }}"
diff --git a/heka/server.sls b/heka/server.sls
index 687e13b..4873886 100644
--- a/heka/server.sls
+++ b/heka/server.sls
@@ -146,5 +146,24 @@
  
 {%- endfor %}
 
+{%- for service_name, service in pillar.items() %}
+{%- for role_name, role in service.iteritems() %}
+{%- if role.get('logging', {}).get('heka', {}).get('enabled', False) %}
+
+/etc/heka/conf.d/99-{{ service_name }}-{{ role_name }}.toml:
+  file.managed:
+  - source: salt://{{ service_name }}/files/heka.toml
+  - template: jinja
+  - mode: 640
+  - group: heka
+  - require:
+    - file: /etc/heka/conf.d/00-hekad.toml
+  - watch_in:
+    - service: heka_service
+
+{%- endif %}
+{%- endfor %}
+{%- endfor %}
+
 {%- endif %}