diff --git a/manifests/site.pp b/manifests/site.pp
index 277309276c..bb23ac32cd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,7 @@ node default {
 #
 # Long lived servers:
 #
-# Node-OS: trusty
+# Node-OS: xenial
 node 'review.openstack.org' {
   $iptables_rules =
     ['-p tcp --syn --dport 29418 -m connlimit --connlimit-above 100 -j REJECT']
@@ -152,7 +152,6 @@ node /^review-dev\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^grafana\d*\.openstack\.org$/ {
   $group = "grafana"
@@ -329,7 +328,6 @@ node /^lists\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^lists\d*\.katacontainers\.io$/ {
   class { 'openstack_project::server':
@@ -344,7 +342,6 @@ node /^lists\d*\.katacontainers\.io$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^paste\d*\.openstack\.org$/ {
   $group = "paste"
@@ -360,7 +357,6 @@ node /^paste\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /planet\d*\.openstack\.org$/ {
   class { 'openstack_project::planet':
@@ -368,7 +364,6 @@ node /planet\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^eavesdrop\d*\.openstack\.org$/ {
   $group = "eavesdrop"
@@ -523,7 +518,6 @@ node /^logstash\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^logstash-worker\d+\.openstack\.org$/ {
   $group = 'logstash-worker'
@@ -541,7 +535,6 @@ node /^logstash-worker\d+\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^subunit-worker\d+\.openstack\.org$/ {
   $group = "subunit-worker"
@@ -557,7 +550,6 @@ node /^subunit-worker\d+\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^elasticsearch0[1-7]\.openstack\.org$/ {
   $group = "elasticsearch"
@@ -653,7 +645,6 @@ node /^git\d+\.openstack\.org$/ {
 }
 
 # A machine to drive AFS mirror updates.
-# Node-OS: trusty
 # Node-OS: xenial
 node /^mirror-update\d*\.openstack\.org$/ {
   $group = "afsadmin"
@@ -691,7 +682,6 @@ node /^mirror\d*\..*\.openstack\.org$/ {
 }
 
 # Serve static AFS content for docs and other sites.
-# Node-OS: trusty
 # Node-OS: xenial
 node /^files\d*\.openstack\.org$/ {
   $group = "files"
@@ -1042,7 +1032,6 @@ node 'nodepool.openstack.org' {
   }
 }
 
-# Node-OS: trusty
 # Node-OS: xenial
 node /^nl\d+\.openstack\.org$/ {
   $group = 'nodepool'