diff --git a/.zuul.yaml b/.zuul.yaml
index 4d4d401ffe..48420990cd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1266,8 +1266,6 @@
           label: ubuntu-bionic
         - name: nl01.openstack.org
           label: ubuntu-xenial
-        - name: nb01.openstack.org
-          label: ubuntu-xenial
         - name: nb04.opendev.org
           label: ubuntu-bionic
     required-projects:
@@ -1277,9 +1275,6 @@
       nl01.openstack.org:
         host_copy_output:
           '/etc/nodepool/nodepool.yaml': logs
-      nb01.openstack.org:
-        host_copy_output:
-          '/etc/nodepool/nodepool.yaml': logs
       nb04.opendev.org:
         host_copy_output:
           '/etc/nodepool/nodepool.yaml': logs
diff --git a/hiera/common.yaml b/hiera/common.yaml
index db0f9c2585..6fff2a7503 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -257,8 +257,6 @@ cacti_hosts:
 - logstash.openstack.org
 - nb01.opendev.org
 - nb02.opendev.org
-- nb01.openstack.org
-- nb02.openstack.org
 - nb03.openstack.org
 - nl01.openstack.org
 - nl02.openstack.org
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index 01a339155a..913067f9c3 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -590,20 +590,6 @@ all:
         region_name: DFW
       public_v4: 104.130.124.242
       public_v6: 2001:4800:7818:104:be76:4eff:fe02:5608
-    nb01.openstack.org:
-      ansible_host: 2001:4800:7818:103:be76:4eff:fe04:9d5a
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 104.130.253.32
-      public_v6: 2001:4800:7818:103:be76:4eff:fe04:9d5a
-    nb02.openstack.org:
-      ansible_host: 2001:4800:7818:101:be76:4eff:fe04:ef2b
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 104.130.135.17
-      public_v6: 2001:4800:7818:101:be76:4eff:fe04:ef2b
     nb03.openstack.org:
       ansible_host: 139.178.85.141
       location:
diff --git a/playbooks/group_vars/graphite.yaml b/playbooks/group_vars/graphite.yaml
index 98f4da2ff0..330be24897 100644
--- a/playbooks/group_vars/graphite.yaml
+++ b/playbooks/group_vars/graphite.yaml
@@ -23,12 +23,6 @@ iptables_extra_allowed_hosts:
   - hostname: nb02.opendev.org
     port: 8125
     protocol: udp
-  - hostname: nb01.openstack.org
-    port: 8125
-    protocol: udp
-  - hostname: nb02.openstack.org
-    port: 8125
-    protocol: udp
   - hostname: nb03.openstack.org
     port: 8125
     protocol: udp
diff --git a/playbooks/group_vars/zookeeper.yaml b/playbooks/group_vars/zookeeper.yaml
index e0255dd20f..e03be16ec0 100644
--- a/playbooks/group_vars/zookeeper.yaml
+++ b/playbooks/group_vars/zookeeper.yaml
@@ -1,8 +1,6 @@
 iptables_extra_allowed_hosts:
   - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb01.opendev.org'}
   - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb02.opendev.org'}
-  - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb01.openstack.org'}
-  - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb02.openstack.org'}
   - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb03.openstack.org'}
   - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb04.opendev.org'}
   - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nl01.openstack.org'}
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index b398773db9..fbbdfc9c7d 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -59,13 +59,6 @@ results:
     - disabled
     - puppet
 
-  nb01.openstack.org:
-    - nodepool
-    - nodepool-builder
-    - puppet
-    - puppet4
-    - webservers
-
   ze01.openstack.org:
     - afs-client
     - zuul
diff --git a/playbooks/service-nodepool.yaml b/playbooks/service-nodepool.yaml
index 84ab9a3a88..58c85a483d 100644
--- a/playbooks/service-nodepool.yaml
+++ b/playbooks/service-nodepool.yaml
@@ -7,7 +7,7 @@
     - configure-openstacksdk
     - nodepool-builder
 
-- hosts: 'nb01.openstack.org:nb02.openstack.org:nb03.openstack.org:!disabled'
+- hosts: 'nb03.openstack.org:!disabled'
   name: "run puppet on all older servers"
   strategy: free
   roles:
diff --git a/testinfra/test_nodepool.py b/testinfra/test_nodepool.py
index 50d1e34d37..999fbef1e2 100644
--- a/testinfra/test_nodepool.py
+++ b/testinfra/test_nodepool.py
@@ -14,16 +14,11 @@
 
 import pytest
 
-testinfra_hosts = ['nl01.openstack.org', 'nb01.openstack.org',
-                   'nb04.opendev.org']
+testinfra_hosts = ['nl01.openstack.org', 'nb04.opendev.org']
 
 
 def test_clouds_yaml(host):
-    if host.backend.get_hostname() == 'nb01.openstack.org':
-        cfg_file = '/home/nodepool/.config/openstack/clouds.yaml'
-    else:
-        cfg_file = '/etc/openstack/clouds.yaml'
-
+    cfg_file = '/etc/openstack/clouds.yaml'
     clouds_yaml = host.file(cfg_file)
     assert clouds_yaml.exists