diff --git a/heka/files/decoder/rsyslog.toml b/heka/files/decoder/rsyslog.toml
index bb4ec51..b9f91a7 100644
--- a/heka/files/decoder/rsyslog.toml
+++ b/heka/files/decoder/rsyslog.toml
@@ -3,7 +3,6 @@
 filename = "lua_decoders/rsyslog.lua"
 
 [RsyslogDecoder.config]
-type = "RSYSLOG_TraditionalFileFormat"
+type = "{{ values.type }}"
 template = '%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n'
 tz = "Europe/Prague"
-
diff --git a/heka/files/encoder/es-json.toml b/heka/files/encoder/es-json.toml
index 282e928..2011474 100644
--- a/heka/files/encoder/es-json.toml
+++ b/heka/files/encoder/es-json.toml
@@ -1,5 +1,5 @@
 [es_json]
 type = "ESJsonEncoder"
 es_index_from_timestamp = true
-index = "{% raw %}%{Logger}-%{%Y.%m.%d}{% endraw %}"
-type_name = "{% raw %}%{Type}-%{Hostname}{% endraw %}"
+index = "{% raw %}%{Type}-%{%Y.%m.%d}{% endraw %}"
+type_name = "{% raw %}%{Logger}-%{Hostname}{% endraw %}"
diff --git a/metadata/service/server/amqp/router.yml b/metadata/service/server/amqp/router.yml
index 0a0b386..9592411 100644
--- a/metadata/service/server/amqp/router.yml
+++ b/metadata/service/server/amqp/router.yml
@@ -31,6 +31,7 @@
           template: \%TIMESTAMP\% \%HOSTNAME\% \%syslogtag\%\%msg:::sp-if-no-1st-sp\%\%msg:::drop-last-lf\%\n
           hostname_keep: TRUE
           tz: Europe/Prague
+          type: rsyslog
         ProtoBufDecoder:
           engine: protobuf
       output:
diff --git a/metadata/service/server/amqp/shipper.yml b/metadata/service/server/amqp/shipper.yml
index 2fc114b..670f12c 100644
--- a/metadata/service/server/amqp/shipper.yml
+++ b/metadata/service/server/amqp/shipper.yml
@@ -19,6 +19,7 @@
           template: \%TIMESTAMP\% \%HOSTNAME\% \%syslogtag\%\%msg:::sp-if-no-1st-sp\%\%msg:::drop-last-lf\%\n
           hostname_keep: TRUE
           tz: Europe/Prague
+          type: rsyslog
       output:
         rabbitmq:
           engine: amqp