diff --git a/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-BEAM.json b/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-BEAM.json
index a5c6932f5051..0000ec71d78f 100644
--- a/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-BEAM.json
+++ b/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-BEAM.json
@@ -140,7 +140,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "erlang_vm_statistics_run_queues_length",
+          "expr": "erlang_vm_statistics_run_queues_length{instance=\"$node\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -156,7 +156,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "erlang_vm_statistics_dirty_io_run_queue_length",
+          "expr": "erlang_vm_statistics_dirty_io_run_queue_length{instance=\"$node\"}",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -173,7 +173,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "erlang_vm_statistics_dirty_cpu_run_queue_length",
+          "expr": "erlang_vm_statistics_dirty_cpu_run_queue_length{instance=\"$node\"}",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -1165,6 +1165,20 @@
   ],
   "templating": {
     "list": [
+      {
+        "current": {},
+        "hide": 2,
+        "includeAll": false,
+        "label": "datasource",
+        "multi": false,
+        "name": "DS_PROMETHEUS",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
       {
         "current": {},
         "datasource": {
diff --git a/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json b/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json
index 3326b119261f..693572122031 100644
--- a/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json
+++ b/deps/rabbitmq_prometheus/docker/grafana/dashboards/Erlang-Distribution.json
@@ -542,10 +542,10 @@
           "displayType": "Regular",
           "displayValueWithAlias": "Never",
           "editorMode": "code",
-          "expr": "erlang_vm_dist_node_state{peer!~\"rabbitmqcli.*\"} * on(rabbitmq_instance, job) group_left(rabbitmq_cluster) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}",
+          "expr": "erlang_vm_dist_node_state{peer!~\"rabbitmqcli.*\"} * on(instance, job) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "{{rabbitmq_instance}} -> {{ peer }}",
+          "legendFormat": "{{rabbitmq_node}} -> {{ peer }}",
           "range": true,
           "refId": "A",
           "units": "none",
@@ -2902,7 +2902,7 @@
         "showExtraInfo": false,
         "showItems": false
       },
-      "type": "flant-statusmap-panel",
+      "type": "status-history",
       "useMax": true,
       "usingPagination": false,
       "xAxis": {