diff --git a/manifests/site.pp b/manifests/site.pp
index 469933f9c9..7ad152012c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -94,7 +94,8 @@ node 'review-dev.openstack.org' {
 }
 
 # Node-OS: trusty
-node 'grafana.openstack.org' {
+# Node-OS: xenial
+node /^grafana\d*\.openstack\.org$/ {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80],
     sysadmins                 => hiera('sysadmins', []),