diff --git a/heka/files/toml/output/elasticsearch.toml b/heka/files/toml/output/elasticsearch.toml
index 54aa685..0e8d03b 100644
--- a/heka/files/toml/output/elasticsearch.toml
+++ b/heka/files/toml/output/elasticsearch.toml
@@ -1,10 +1,10 @@
 [{{ output_name }}_output]
 type = "ElasticSearchOutput"
-message_matcher = "{{ output.message_matcher }}"
-encoder = "{{ output.encoder }}"
+message_matcher = "Type == 'log' || Type == 'notification'"
+encoder = "elasticsearch_encoder"
 server = "http://{{ output.host }}:{{ output.port }}"
-flush_interval = {{ output.flush_interval }}
-flush_count = {{ output.flush_count }}
+flush_interval = 5000
+flush_count = 100
 use_buffering = true
 
 [{{ output_name }}_output.buffering]
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 8781888..0a53d00 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -3,14 +3,6 @@
     elasticsearch:
       engine: elasticsearch
   output:
-    elasticsearch:
-      engine: elasticsearch
-      message_matcher: "Type == 'log' || Type  == 'notification'"
-      encoder: elasticsearch_encoder
-      host: mon
-      port: 9200
-      flush_interval: 5000
-      flush_count: 100
     metric_collector:
       engine: tcp
       host: 127.0.0.1