diff --git a/manifests/site.pp b/manifests/site.pp
index 813f53d4a6..8bef14ef0a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -335,7 +335,8 @@ node /planet\d*\.openstack\.org$/ {
 }
 
 # Node-OS: trusty
-node 'eavesdrop.openstack.org' {
+# Node-OS: xenial
+node /^eavesdrop\d*\.openstack\.org$/ {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80],
     sysadmins                 => hiera('sysadmins', []),