diff --git a/heka/files/output/elasticsearch.toml b/heka/files/output/elasticsearch.toml
index bf06cbd..b276b04 100644
--- a/heka/files/output/elasticsearch.toml
+++ b/heka/files/output/elasticsearch.toml
@@ -7,7 +7,7 @@
 flush_count = {{ values.flush_count }}
 
 [output_{{ name }}.buffering]
-max_file_size = 268435456 #256M
-max_buffer_size = 10737418240 #10G
+max_file_size = 16777216 #16M
+max_buffer_size = 134217728 #128M
 full_action = "block"
 cursor_update_count = 100
diff --git a/metadata/service/server/amqp/router.yml b/metadata/service/server/amqp/router.yml
index 9592411..0d244a1 100644
--- a/metadata/service/server/amqp/router.yml
+++ b/metadata/service/server/amqp/router.yml
@@ -17,7 +17,7 @@
           exchange_type: fanout
           decoder: ProtoBufDecoder
           splitter: HekaFramingSplitter
-          prefetch_count: 200
+          prefetch_count: 80
         rsyslog_syslog:
           engine: logstreamer
           log_directory: /var/log