diff --git a/keystone/files/heka.toml b/keystone/files/heka.toml
new file mode 100644
index 0000000..6ddcadc
--- /dev/null
+++ b/keystone/files/heka.toml
@@ -0,0 +1,22 @@
+{%- if pillar.keystone.server is defined %}
+[logstreamer_keystone]
+type = "LogstreamerInput"
+log_directory = "/var/log/keystone"
+file_match = 'keystone\.log\.?(?P<Index>\d+)?(.gz)?'
+priority = ["^Index"]
+decoder = "keystone"
+oldest_duration = "168h"
+
+[logstreamer_keystone_manage]
+type = "LogstreamerInput"
+log_directory = "/var/log/keystone"
+file_match = 'keystone-manage\.log\.?(?P<Index>\d+)?(.gz)?'
+priority = ["^Index"]
+decoder = "keystone"
+oldest_duration = "168h"
+
+[keystone]
+type = "SandboxDecoder"
+filename = "lua_modules/decoders/openstack.lua"
+module_directory = "/usr/share/heka/lua_modules;/usr/share/heka/lua_modules/common"
+{% endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 8ad66dc..1c21fb8 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: