diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index 87fdb09998..8419b120ed 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -164,6 +164,7 @@ parameter_defaults:
     telemetry:
       format: JSON
       presettle: false
+  CollectdAmqpQueueLimit: 40
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml
index 192f5b20c3..b5d6ccacfd 100644
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/deployment/metrics/collectd-container-puppet.yaml
@@ -299,6 +299,12 @@ parameters:
       Interval on which metrics should be sent to AMQP intermediary. If not set
       the default for all collectd plugins is used.
     default: -666
+  CollectdAmqpSendQueueLimit:
+    type: number
+    description: >
+      Number of data sets to be kept in memory, older sets will be discarded,
+      if set to -1, this feature is disabled.
+    default: -1
   CollectdEnableSensubility:
     type: boolean
     description: Set to true if sensubility should be executed by exec plugin.
@@ -378,6 +384,8 @@ conditions:
     equals: [{get_param: CollectdAmqpHost}, nil]
   amqp_default_interval:
     equals: [{get_param: CollectdAmqpInterval}, -666]
+  amqp_default_send_queue_limit:
+    equals: [{get_param: CollectdAmqpSendQueueLimit}, -1]
   collectd_connection:
     equals: [{get_param: CollectdConnectionType}, 'network']
   gnocchi_connection:
@@ -480,6 +488,11 @@ outputs:
                 - {}
                 - tripleo::profile::base::metrics::collectd::amqp_interval:
                     get_param: CollectdAmqpInterval
+              - if:
+                - amqp_default_send_queue_limit
+                - {}
+                - tripleo::profile::base::metrics::collectd::amqp_default_send_queue_limit:
+                    get_param: CollectdAmqpSendQueueLimit
               - if:
                 - amqp_default_connection
                 - tripleo::profile::base::metrics::collectd::amqp_host:
diff --git a/environments/enable-stf.yaml b/environments/enable-stf.yaml
index 436a6c8af6..f50b47c3fd 100644
--- a/environments/enable-stf.yaml
+++ b/environments/enable-stf.yaml
@@ -14,6 +14,7 @@ parameter_defaults:
   CollectdConnectionType: amqp1
   CollectdAmqpInterval: 5
   CollectdDefaultPollingInterval: 5
+  CollectdAmqpQueueLimit: 40
 
   CollectdAmqpInstances:
     notify:
diff --git a/environments/metrics/collectd-write-qdr.yaml b/environments/metrics/collectd-write-qdr.yaml
index 97305dd01b..9eff8e60f2 100644
--- a/environments/metrics/collectd-write-qdr.yaml
+++ b/environments/metrics/collectd-write-qdr.yaml
@@ -6,6 +6,7 @@ resource_registry:
 
 parameter_defaults:
   CollectdConnectionType: amqp1
+  CollectdAmqpQueueLimit: 40
   CollectdAmqpInstances:
     notify:
       notify: true