diff --git a/heat/files/heka.toml b/heat/files/heka.toml
index c387da1..4546613 100644
--- a/heat/files/heka.toml
+++ b/heat/files/heka.toml
@@ -1,14 +1,16 @@
 {%- if pillar.heat.server is defined %}
+
 [logstreamer_heat]
 type = "LogstreamerInput"
 log_directory = "/var/log/heat"
-file_match = 'heat-engine\.log\.?(?P<Index>\d+)?(.gz)?'
+file_match = '(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
+differentiator = ["'heat','_','Service'"]
 priority = ["^Index"]
-decoder = "heat"
-oldest_duration = "168h"
+decoder = "openstack"
 
-[heat]
+[openstack]
 type = "SandboxDecoder"
 filename = "lua_modules/decoders/openstack.lua"
 module_directory = "/usr/share/heka/lua_modules;/usr/share/heka/lua_modules/common"
+
 {% endif %}