diff --git a/manifests/site.pp b/manifests/site.pp
index 8bef14ef0a..48630e3917 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -391,7 +391,8 @@ node /^ethercalc\d+\.openstack\.org$/ {
 }
 
 # Node-OS: trusty
-node 'etherpad.openstack.org' {
+# Node-OS: xenial
+node /^etherpad\d*\.openstack\.org$/ {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [22, 80, 443],
     sysadmins                 => hiera('sysadmins', []),
@@ -408,7 +409,8 @@ node 'etherpad.openstack.org' {
 }
 
 # Node-OS: trusty
-node 'etherpad-dev.openstack.org' {
+# Node-OS: xenial
+node /^etherpad-dev\d*\.openstack\.org$/ {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [22, 80, 443],
     sysadmins                 => hiera('sysadmins', []),