diff --git a/hiera/common.yaml b/hiera/common.yaml
index b2aa258713..2361963ccd 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -459,6 +459,7 @@ cacti_hosts:
 - pbx.openstack.org
 - pholio01.openstack.org
 - planet.openstack.org
+- planet01.openstack.org
 - proposal.slave.openstack.org
 - puppetdb.openstack.org
 - puppetmaster.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index c148a7d6d0..0b1a275a7a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -316,7 +316,8 @@ node /^paste\d+\.openstack\.org$/ {
 
 # Node-OS: precise
 # Node-OS: trusty
-node 'planet.openstack.org' {
+# Node-OS: xenial
+node /planet\d+\.openstack\.org$/ {
   class { 'openstack_project::planet':
     sysadmins => hiera('sysadmins', []),
   }