diff --git a/manifests/site.pp b/manifests/site.pp
index 19852e8bfb..246d8f3ad0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -278,7 +278,8 @@ node /^groups-dev\d*\.openstack\.org$/ {
 }
 
 # Node-OS: trusty
-node 'lists.openstack.org' {
+# Node-OS: xenial
+node /^lists\d*\.openstack\.org$/ {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [25, 80, 465],
     manage_exim => false,
@@ -292,7 +293,8 @@ node 'lists.openstack.org' {
 }
 
 # Node-OS: trusty
-node 'lists.katacontainers.io' {
+# Node-OS: xenial
+node /^lists\d*\.katacontainers\.io$/ {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [25, 80, 465],
     manage_exim => false,