diff --git a/manifests/site.pp b/manifests/site.pp
index 732651791b..c79ba642ab 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -674,7 +674,8 @@ node /^design-summit-prep\d*\.openstack\.org$/ {
 
 # Serve static AFS content for docs and other sites.
 # Node-OS: trusty
-node 'files01.openstack.org' {
+# Node-OS: xenial
+node /^files\d*\.openstack\.org$/ {
   $group = "files"
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443],