diff --git a/servers/puppet/modules/humbug/files/munin/plugin-conf.d/munin-node.conf b/servers/puppet/modules/humbug/files/munin/plugin-conf.d/munin-node.conf
index c109e22da0..d25392e438 100644
--- a/servers/puppet/modules/humbug/files/munin/plugin-conf.d/munin-node.conf
+++ b/servers/puppet/modules/humbug/files/munin/plugin-conf.d/munin-node.conf
@@ -122,10 +122,13 @@ env.PGPORT 5432
 user humbug
 group humbug
 
+[rabbitmq_messages]
+env.queue_warn 100
+env.queue_crit 500
+
 [rabbitmq_queue_memory]
-user root
-env.QUEUE_WARN 1000000
-env.QUEUE_CRIT 2000000
+env.queue_warn 20000000
+env.queue_crit 40000000
 
 [rabbitmq_*]
 user root