diff --git a/cinder/files/heka.toml b/cinder/files/heka.toml
index 545a4f4..4ca7346 100644
--- a/cinder/files/heka.toml
+++ b/cinder/files/heka.toml
@@ -1,32 +1,13 @@
-{%- if pillar.cinder.controller is defined %}
-[logstreamer_cinder_scheduler]
+[logstreamer_cinder]
 type = "LogstreamerInput"
 log_directory = "/var/log/cinder"
-file_match = 'cinder-scheduler\.log\.?(?P<Index>\d+)?(.gz)?'
+file_match = '(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
+differentiator = ["'cinder','_','Service'"]
 priority = ["^Index"]
 decoder = "openstack"
-oldest_duration = "168h"
-
-[logstreamer_cinder_manage]
-type = "LogstreamerInput"
-log_directory = "/var/log/cinder"
-file_match = 'cinder-manage\.log\.?(?P<Index>\d+)?(.gz)?'
-priority = ["^Index"]
-decoder = "openstack"
-oldest_duration = "168h"
-{%- endif %}
-
-{%- if pillar.cinder.volume is defined %}
-[logstreamer_cinder_volume]
-type = "LogstreamerInput"
-log_directory = "/var/log/cinder"
-file_match = 'cinder-volume\.log\.?(?P<Index>\d+)?(.gz)?'
-priority = ["^Index"]
-decoder = "openstack"
-oldest_duration = "168h"
-{%- endif %}
 
 [openstack]
 type = "SandboxDecoder"
 filename = "lua_modules/decoders/openstack.lua"
 module_directory = "/usr/share/heka/lua_modules;/usr/share/heka/lua_modules/common"
+
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 962ce0b..bb1eadc 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: