diff --git a/glance/files/heka.toml b/glance/files/heka.toml
index 18a212c..abae8fd 100644
--- a/glance/files/heka.toml
+++ b/glance/files/heka.toml
@@ -2,13 +2,14 @@
 [logstreamer_glance]
 type = "LogstreamerInput"
 log_directory = "/var/log/glance"
-file_match = 'glance-registry\.log\.?(?P<Index>\d+)?(.gz)?'
+file_match = '(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
+differentiator = ["'glance','_','Service'"]
 priority = ["^Index"]
-decoder = "glance"
-oldest_duration = "168h"
+decoder = "openstack"
 
-[glance]
+[openstack]
 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 fd4619b..260ce7e 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: