diff --git a/hiera/common.yaml b/hiera/common.yaml
index d1e7fc41fc..8e2a8a0d15 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -470,7 +470,7 @@ cacti_hosts:
 - review.openstack.org
 - stackalytics.openstack.org
 - static.openstack.org
-- status.openstack.org
+- status01.openstack.org
 - storyboard.openstack.org
 - subunit-worker02.openstack.org
 - translate.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 7530168af4..732651791b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -842,7 +842,10 @@ node /^zk\d+\.openstack\.org$/ {
 
 # A machine to serve various project status updates.
 # Node-OS: trusty
-node 'status.openstack.org' {
+# Node-OS: xenial
+node /^status\d*\.openstack\.org$/ {
+  $group = 'status'
+
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [22, 80, 443],
     sysadmins                 => hiera('sysadmins', []),
diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt
index b9e876b335..799b070bfc 100644
--- a/modules/openstack_project/files/puppetmaster/groups.txt
+++ b/modules/openstack_project/files/puppetmaster/groups.txt
@@ -20,3 +20,4 @@ wiki-dev ~wiki-dev\d+\.openstack\.org
 zuul-merger ~z[lm](static)?\d+\.openstack\.org
 zuul-executor ~ze\d+\.openstack\.org
 grafana ~grafana\d*\.openstack\.org
+status ~status\d*\.openstack\.org