diff --git a/manifests/site.pp b/manifests/site.pp
index aeabac66e8..98263591ff 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1132,6 +1132,7 @@ node 'codesearch.openstack.org' {
 
 # Node-OS: trusty
 node /.*wheel-mirror-.*\.openstack\.org/ {
+  $group = 'wheel-mirror'
   include openstack_project
   class { 'openstack_project::wheel_mirror_slave':
     sysadmins                      => hiera('sysadmins', []),
diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt
index 478366c155..cdba476c2e 100644
--- a/modules/openstack_project/files/puppetmaster/groups.txt
+++ b/modules/openstack_project/files/puppetmaster/groups.txt
@@ -9,4 +9,5 @@ zuul-merger ~zm\d+\.openstack\.org
 ci-backup ci-backup-*.openstack.org
 afsdb afsdb*.openstack.org
 afs afs*.*.openstack.org
+wheel-mirror *wheel-mirror-*.openstack.org
 disabled ci-backup-rs-ord.openstack.org:jenkins-dev.openstack.org