diff --git a/heat/files/heka.toml b/heat/files/heka.toml
index 4546613..cd0f583 100644
--- a/heat/files/heka.toml
+++ b/heat/files/heka.toml
@@ -3,10 +3,11 @@
 [logstreamer_heat]
 type = "LogstreamerInput"
 log_directory = "/var/log/heat"
-file_match = '(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
+file_match = '(?P<Service>.+)\.log\.?(?P<Index>\d*)?(.gz)?'
 differentiator = ["'heat','_','Service'"]
 priority = ["^Index"]
 decoder = "openstack"
+oldest_duration = "168h"
 
 [openstack]
 type = "SandboxDecoder"