diff --git a/manifests/site.pp b/manifests/site.pp
index 8332d2af83..fb682a38d0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -755,21 +755,6 @@ node /^adns\d+\.openstack\.org$/ {
   }
 }
 
-# This is a hidden authoritative master nameserver, not publicly
-# accessible.
-# Node-OS: xenial
-node /^adns\d+\.opendev\.org$/ {
-  $group = 'adns'
-
-  class { 'openstack_project::server': }
-
-  class { 'openstack_project::master_nameserver':
-    tsig_key => hiera('tsig_key', {}),
-    dnssec_keys => hiera_hash('dnssec_keys', {}),
-    notifies => ['104.239.140.165', '162.253.55.16'],
-  }
-}
-
 # These are publicly accessible authoritative slave nameservers.
 # Node-OS: xenial
 node /^ns\d+\.openstack\.org$/ {
@@ -801,37 +786,6 @@ node /^ns\d+\.openstack\.org$/ {
   }
 }
 
-# These are publicly accessible authoritative slave nameservers.
-# Node-OS: xenial
-node /^ns\d+\.opendev\.org$/ {
-  $group = 'ns'
-
-  class { 'openstack_project::server': }
-
-  $tsig_key = hiera('tsig_key', {})
-  if $tsig_key != {} {
-    $tsig_name = 'tsig'
-    nsd::tsig { 'tsig':
-      algo => $tsig_key[algorithm],
-      data => $tsig_key[secret],
-    }
-  } else {
-    $tsig_name = undef
-  }
-
-  class { '::nsd':
-    ip_addresses => [ $::ipaddress, $::ipaddress6 ],
-    zones => {
-      'adns1_zones' => {
-        allow_notify => ['104.239.146.24'],
-        masters => ['104.239.146.24'],
-        zones => ['opendev.org'],
-        tsig_name => $tsig_name,
-      }
-    }
-  }
-}
-
 # Node-OS: xenial
 node /^nl\d+\.openstack\.org$/ {
   $group = 'nodepool'