diff --git a/elasticsearch/files/heka.toml b/elasticsearch/files/heka.toml
new file mode 100644
index 0000000..eb9e07f
--- /dev/null
+++ b/elasticsearch/files/heka.toml
@@ -0,0 +1,22 @@
+{%- from "elasticsearch/map.jinja" import server with context -%}
+
+{%- if server.curator is defined and server.curator.get('logfile', '') %}
+{%- set log_dir = server.curator.logfile|replace(server.curator.logfile.split('/')[-1], "") %}
+[logstreamer_elasticsearch_curator]
+type = "LogstreamerInput"
+log_directory = "{{ log_dir }}"
+file_match = '{{ server.curator.logfile.split('/')[-1]|replace('.', '\.') }}\.?(?P<Index>\d+)?(\.gz)?'
+priority = ["^Index"]
+decoder = "Sandbox_elasticsearch_curator"
+
+[Sandbox_elasticsearch_curator]
+type = "SandboxDecoder"
+filename = "lua_decoders/json.lua"
+
+[Sandbox_elasticsearch_curator.config]
+type = "elasticsearch_curator"
+payload = "message"
+severity = "loglevel"
+timestamp = "@timestamp"
+map_fields = true
+{%- endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 1ae90e2..b851c62 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -4,7 +4,7 @@
       collectd:
         enabled: false
       heka:
-        enabled: false
+        enabled: true
       sensu:
         enabled: true
       sphinx: