diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 5ad045a..d8b2dce 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -670,6 +670,8 @@
       engine: sandbox
       module_file: /usr/share/lma_collector/decoders/metering.lua
       module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
+      # The default output_limit value (64k) is too low to deal with Ceilometer samples
+      output_limit: 524288
       config:
         decoder: 'ceilometer'
         decode_resources: {{ ceilometer_collector.resource_decoding|lower }}
diff --git a/metadata/service/remote_collector/container.yml b/metadata/service/remote_collector/container.yml
new file mode 100644
index 0000000..eefddda
--- /dev/null
+++ b/metadata/service/remote_collector/container.yml
@@ -0,0 +1,9 @@
+applications:
+- heka
+classes:
+- service.heka.support
+parameters:
+  heka:
+    remote_collector:
+      enabled: true
+      container_mode: true