diff --git a/roles/ceph-infra/tasks/dashboard_firewall.yml b/roles/ceph-infra/tasks/dashboard_firewall.yml
index 4c3913e1ea..f3166355da 100644
--- a/roles/ceph-infra/tasks/dashboard_firewall.yml
+++ b/roles/ceph-infra/tasks/dashboard_firewall.yml
@@ -52,4 +52,6 @@
         permanent: true
         immediate: true
         state: enabled
-  when: inventory_hostname in groups.get('grafana-server', [])
+  when:
+    - grafana_server_group_name is defined
+    - grafana_server_group_name in group_names