diff --git a/manifests/site.pp b/manifests/site.pp
index a8db225dbf..efc7873253 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1764,7 +1764,9 @@ node 'odsreg.openstack.org' {
 }
 
 # Node-OS: trusty
-node 'codesearch.openstack.org' {
+# Node-OS: xenial
+node /^codesearch\d*\.openstack\.org$/ {
+  $group = "codesearch"
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80],
     sysadmins                 => hiera('sysadmins', []),