diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 157d8f8..9f04a8b 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -708,10 +708,12 @@
       preserve_data: false
       message_matcher: "Type =~ /ceilometer_samples$/"
       ticker_interval: 1
+      # The default output_limit value (64k) is too low to deal with Ceilometer samples
+      output_limit: 524288
       config:
         time_precision: "{{ ceilometer_collector.influxdb_time_precision }}"
         payload_name: 'sample_data'
-        flush_count: 500
+        flush_count: 200
         bulk_metric_type_matcher: 'ceilometer_samples'
   {%- endif %}
   {%- if ceilometer_collector.sensu_host is defined %}