diff --git a/manifests/site.pp b/manifests/site.pp
index ccb921c93a..02b4f51a45 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -67,6 +67,8 @@ node 'review.openstack.org' {
 
 # Node-OS: xenial
 node 'review01.openstack.org' {
+  $group = "review"
+
   $iptables_rules =
     ['-p tcp --syn --dport 29418 -m connlimit --connlimit-above 100 -j REJECT']
   class { 'openstack_project::server':
diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt
index 7cb8fe6835..91b075b845 100644
--- a/modules/openstack_project/files/puppetmaster/groups.txt
+++ b/modules/openstack_project/files/puppetmaster/groups.txt
@@ -12,6 +12,7 @@ git-loadbalancer ~git(-fe\d+)?\.openstack\.org
 git-server ~git\d+\.openstack\.org
 logstash-worker ~logstash-worker\d+\.openstack\.org
 nodepool nodepool*.openstack.org:nb*.openstack.org:nl*.openstack.org
+review ~review\d+\.openstack\.org
 review-dev ~review-dev\d*\.openstack\.org
 subunit-worker ~subunit-worker\d+\.openstack\.org
 translate ~translate\d+\.openstack\.org