diff --git a/salt/grafana/panels/redis_queue_graph.json.jinja b/salt/grafana/panels/redis_queue_graph.json.jinja
index 1b1ca1e3a..de0becdbd 100644
--- a/salt/grafana/panels/redis_queue_graph.json.jinja
+++ b/salt/grafana/panels/redis_queue_graph.json.jinja
@@ -98,9 +98,15 @@
       ],
       "tags": [
         {
-          "key": "host",
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
           "operator": "=",
-          "value": "$servername"
+          "condition": "OR"
         }
       ]
     },
@@ -142,9 +148,15 @@
       ],
       "tags": [
         {
-          "key": "host",
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
           "operator": "=",
-          "value": "$servername"
+          "condition": "OR"
         }
       ]
     }