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: