diff --git a/keystone/files/heka.toml b/keystone/files/heka.toml
index 6ddcadc..c2944f0 100644
--- a/keystone/files/heka.toml
+++ b/keystone/files/heka.toml
@@ -2,20 +2,13 @@
 [logstreamer_keystone]
 type = "LogstreamerInput"
 log_directory = "/var/log/keystone"
-file_match = 'keystone\.log\.?(?P<Index>\d+)?(.gz)?'
+file_match = '(?P<Service>.+)\.log\.?(?P<Index>\d*)?(.gz)?'
+differentiator = ['keystone','_','Service']
 priority = ["^Index"]
-decoder = "keystone"
+decoder = "openstack"
 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]
+[openstack]
 type = "SandboxDecoder"
 filename = "lua_modules/decoders/openstack.lua"
 module_directory = "/usr/share/heka/lua_modules;/usr/share/heka/lua_modules/common"