diff --git a/heka/files/encoder/es-json.toml b/heka/files/encoder/es-json.toml
index 170dd36..282e928 100644
--- a/heka/files/encoder/es-json.toml
+++ b/heka/files/encoder/es-json.toml
@@ -1,9 +1,5 @@
 [es_json]
 type = "ESJsonEncoder"
-index = "{{ values.index }}"
-
-{% if values.es_index_from_timestamp == True %}
 es_index_from_timestamp = true
-{%- else -%}
-es_index_from_timestamp = false
-{%- endif -%}
+index = "{% raw %}%{Logger}-%{%Y.%m.%d}{% endraw %}"
+type_name = "{% raw %}%{Type}-%{Hostname}{% endraw %}"
diff --git a/metadata/service/server/amqp/router.yml b/metadata/service/server/amqp/router.yml
index f163365..253c6c7 100644
--- a/metadata/service/server/amqp/router.yml
+++ b/metadata/service/server/amqp/router.yml
@@ -38,7 +38,7 @@
           engine: elasticsearch
           host: ${_param:heka_router_output_host}
           port: 9200
-          encoder: es_payload
+          encoder: es_json
           message_matcher: "Logger != 'hekad'"
           flush_count: 10
           flush_interval: 1000
@@ -48,7 +48,5 @@
       encoder:
         es_json:
           engine: es-json
-          index: logfile-%{%Y.%m.%d}
-          es_index_from_timestamp: true
         es_payload:
           engine: es-payload