diff --git a/manifests/site.pp b/manifests/site.pp
index aefc031a96..a087a5e83e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -786,6 +786,7 @@ node 'status.openstack.org' {
 
 # Node-OS: trusty
 node 'nodepool.openstack.org' {
+  $group = 'nodepool'
   # TODO(pabelanger): Move all of this back into nodepool manifest, it has
   # grown too big.
   $bluebox_username    = hiera('nodepool_bluebox_username', 'username')
@@ -886,6 +887,7 @@ node 'nodepool.openstack.org' {
 # Node-OS: trusty
 # Node-OS: xenial
 node /^nb\d+\.openstack\.org$/ {
+  $group = 'nodepool'
   # TODO(pabelanger): Move all of this back into nodepool manifest, it has
   # grown too big.
   $bluebox_username    = hiera('nodepool_bluebox_username', 'username')
diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt
index 9ae271b3bd..8077c1ed86 100644
--- a/modules/openstack_project/files/puppetmaster/groups.txt
+++ b/modules/openstack_project/files/puppetmaster/groups.txt
@@ -1,17 +1,18 @@
-logstash-worker ~logstash-worker\d+\.openstack\.org
-subunit-worker ~subunit-worker\d+\.openstack\.org
+afs afs*.*.openstack.org
+afsadmin mirror-update.openstack.org:release.slave.openstack.org
+afsdb afsdb*.openstack.org
+cacti ~cacti\d+\.openstack\.org
+ci-backup ci-backup-*.openstack.org
+disabled ci-backup-rs-ord.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org
 elasticsearch ~elasticsearch0[1-7]\.openstack\.org
 git-loadbalancer ~git(-fe\d+)?\.openstack\.org
 git-server ~git\d+\.openstack\.org
-zuul-merger ~z[lm](static)?\d+\.openstack\.org
-cacti ~cacti\d+\.openstack\.org
-ci-backup ci-backup-*.openstack.org
-afsdb afsdb*.openstack.org
-afs afs*.*.openstack.org
-wheel-mirror *wheel-mirror-*.openstack.org
-afsadmin mirror-update.openstack.org:release.slave.openstack.org
+logstash-worker ~logstash-worker\d+\.openstack\.org
+nodepool nodepool*.openstack.org:nb*.openstack.org
 signing signing*.ci.openstack.org
+subunit-worker ~subunit-worker\d+\.openstack\.org
+translate-dev ~translate-dev\d*\.openstack\.org
+wheel-mirror *wheel-mirror-*.openstack.org
 wiki ~wiki\d+\.openstack\.org
 wiki-dev ~wiki-dev\d+\.openstack\.org
-translate-dev ~translate-dev\d*\.openstack\.org
-disabled ci-backup-rs-ord.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org
+zuul-merger ~z[lm](static)?\d+\.openstack\.org