diff --git a/heka/files/input/logstreamer.toml b/heka/files/input/logstreamer.toml
index 9299597..73eab4f 100644
--- a/heka/files/input/logstreamer.toml
+++ b/heka/files/input/logstreamer.toml
@@ -3,11 +3,14 @@
 log_directory = "{{ values.log_directory }}"
 file_match = '{{ values.file_match }}'
 {% if values.priority is defined %}
-priority = {{ values.priority }}
+priority = '{{ values.priority }}'
 {% endif %}
 {% if values.decoder is defined %}
 decoder = "{{ values.decoder }}"
 {% endif %}
 {% if values.splitter is defined %}
-splitter = {{ values.splitter }}
+splitter = ''{{ values.splitter }}''
+{% endif %}
+{% if values.differentiator is defined %}
+differentiator = '{{ values.differentiator }}'
 {% endif %}
diff --git a/metadata/service/server/amqp/shipper.yml b/metadata/service/server/amqp/shipper.yml
index a100a24..17083ea 100644
--- a/metadata/service/server/amqp/shipper.yml
+++ b/metadata/service/server/amqp/shipper.yml
@@ -9,20 +9,9 @@
         rsyslog_syslog:
           engine: logstreamer
           log_directory: /var/log
-          file_match: syslog\.?(?P<Index>\d+)?(.gz)?
+          file_match: "?P<Service>daemon\.log|cron\.log|mail\.log|kern\.log|auth\.log|syslog|messages|debug)\.?(?P<Index>\d+)?(.gz)?"
           priority: ["^Index"]
-          decoder: RsyslogDecoder
-        rsyslog_auth:
-          engine: logstreamer
-          log_directory: /var/log
-          file_match: auth\.log\.?(?P<Index>\d+)?(.gz)?
-          priority: ["^Index"]
-          decoder: RsyslogDecoder
-        rsyslog_kern:
-          engine: logstreamer
-          log_directory: /var/log
-          file_match: kern\.log\.?(?P<Index>\d+)?(.gz)?
-          priority: ["^Index"]
+          differentiator: [ "rsyslog-", "Service" ]
           decoder: RsyslogDecoder
       decoder:
         rsyslog: