diff --git a/site-container.yml.sample b/site-container.yml.sample
index 6063108f1..53f7cb806 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -558,7 +558,7 @@
           name: ceph-grafana
       when: dashboard_enabled
 
-- hosts: '{{ (groups["mgrs"] | default(groups["mons"]))[0] }}'
+- hosts: '{{ (groups["grafana-server"] | default(groups["mgrs"]) | default(groups["mons"]))[0] | default(omit) }}'
   become: true
   tasks:
     - block:
diff --git a/site.yml.sample b/site.yml.sample
index 8696959e0..d8726ecf5 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -487,7 +487,7 @@
             name: ceph-grafana
       when: dashboard_enabled
 
-- hosts: '{{ (groups["mgrs"] | default(groups["mons"]))[0] }}'
+- hosts: '{{ (groups["grafana-server"] | default(groups["mgrs"]) | default(groups["mons"]))[0] | default(omit) }}'
   become: true
   tasks:
     - import_role: