diff --git a/deps/rabbitmq_prometheus/docker/docker-compose.yml b/deps/rabbitmq_prometheus/docker/docker-compose.yml
index 08af7282ed..0d435477a6 100644
--- a/deps/rabbitmq_prometheus/docker/docker-compose.yml
+++ b/deps/rabbitmq_prometheus/docker/docker-compose.yml
@@ -51,9 +51,10 @@ services:
       - "rabbitmq-prometheus"
     environment:
       URI: "amqp://guest:guest@rabbitmq1:5672/%2f"
-      QUEUE: published-confirmed
+      QUEUE: publisher-confirms
+      ROUTING_KEY: publisher-confirms
       AUTOACK: "true"
-      VARIABLE_RATE: "10:30,100:30"
+      VARIABLE_RATE: "12:30,25:30,50:30,100:30"
       CONFIRM: 1
       CONFIRM_TIMEOUT: 1
       START_TIMEOUT: 30
@@ -63,7 +64,7 @@ services:
       - "rabbitmq-prometheus"
     environment:
       URI: "amqp://guest:guest@rabbitmq2:5672/%2f"
-      RATE: 20
+      VARIABLE_RATE: "2:30,4:30,10:30"
       CONSUMERS: 0
       FLAG: mandatory
       START_TIMEOUT: 30
@@ -73,7 +74,7 @@ services:
       - "rabbitmq-prometheus"
     environment:
       URI: "amqp://guest:guest@rabbitmq2:5672/%2f"
-      RATE: 25
+      VARIABLE_RATE: "5:30,10:30,20:30"
       CONSUMERS: 0
       START_TIMEOUT: 30
   slow-consumer-persistent:
@@ -82,14 +83,16 @@ services:
       - "rabbitmq-prometheus"
     environment:
       URI: "amqp://guest:guest@rabbitmq3:5672/%2f"
-      QUEUE: slow-consumer
-      QUEUE_ARGS: x-max-length=1000
+      QUEUE: slow-consumer-persistent
+      ROUTING_KEY: slow-consumer-persistent
+      QUEUE_ARGS: x-max-length=500
       FLAG: persistent
       AUTO_DELETE: "false"
-      RATE: 30
-      CONSUMER_RATE: 20
+      SIZE: 256000
+      VARIABLE_RATE: "20:10,1:40"
+      CONSUMER_RATE: 5
       AUTOACK: "false"
-      QOS: 40
+      QOS: 5
       START_TIMEOUT: 30
   prometheus:
     image: prom/prometheus:v2.9.0
diff --git a/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json b/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json
index 97988e7ca9..7e761276f6 100644
--- a/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json
+++ b/deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Overview.json
@@ -47,7 +47,7 @@
       },
       "id": 9,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -137,7 +137,7 @@
       },
       "id": 19,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -240,7 +240,7 @@
       },
       "id": 30,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -330,7 +330,7 @@
       },
       "id": 31,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -433,7 +433,7 @@
       },
       "id": 13,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -523,7 +523,7 @@
       },
       "id": 18,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -613,7 +613,7 @@
       },
       "id": 16,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -703,7 +703,7 @@
       },
       "id": 12,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -793,7 +793,7 @@
       },
       "id": 34,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -896,7 +896,7 @@
       },
       "id": 14,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -986,7 +986,7 @@
       },
       "id": 21,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1076,7 +1076,7 @@
       },
       "id": 24,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1166,7 +1166,7 @@
       },
       "id": 15,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1256,7 +1256,7 @@
       },
       "id": 20,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1346,7 +1346,7 @@
       },
       "id": 23,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1436,7 +1436,7 @@
       },
       "id": 22,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1526,7 +1526,7 @@
       },
       "id": 25,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1629,7 +1629,7 @@
       },
       "id": 7,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1666,7 +1666,7 @@
           "fill": true,
           "line": true,
           "op": "gt",
-          "value": 1073741824,
+          "value": 268435456,
           "yaxis": "left"
         },
         {
@@ -1674,7 +1674,7 @@
           "fill": true,
           "line": true,
           "op": "gt",
-          "value": 536870912,
+          "value": 134217728,
           "yaxis": "left"
         }
       ],
@@ -1735,7 +1735,7 @@
       },
       "id": 2,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1842,7 +1842,7 @@
       },
       "id": 6,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -1948,7 +1948,7 @@
       },
       "id": 8,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -2053,7 +2053,7 @@
       },
       "id": 5,
       "legend": {
-        "alignAsTable": false,
+        "alignAsTable": true,
         "avg": false,
         "current": true,
         "max": true,
@@ -2152,7 +2152,7 @@
     "list": []
   },
   "time": {
-    "from": "now-15m",
+    "from": "now-5m",
     "to": "now"
   },
   "timepicker": {
diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq.conf b/deps/rabbitmq_prometheus/docker/rabbitmq.conf
index 244b997d77..c1698ac3bb 100644
--- a/deps/rabbitmq_prometheus/docker/rabbitmq.conf
+++ b/deps/rabbitmq_prometheus/docker/rabbitmq.conf
@@ -3,7 +3,8 @@ listeners.tcp.default = 5672
 management.listener.port = 15672
 management.listener.ssl = false
 
-vm_memory_high_watermark.absolute = 1024MiB
+vm_memory_high_watermark.absolute = 256MiB
+vm_memory_high_watermark_paging_ratio = 0.5
 disk_free_limit.absolute = 2048MiB
 
 cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config