diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index adc5be51f2..2db4d9ca61 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -564,13 +564,6 @@ all:
         region_name: RegionOne
       public_v4: 139.178.85.151
       public_v6: 2604:1380:4111:3e54:f816:3eff:fecf:7903
-    nb04.opendev.org:
-      ansible_host: 104.239.240.75
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 104.239.240.75
-      public_v6: 2001:4800:7819:104:be76:4eff:fe04:357c
     nl01.openstack.org:
       ansible_host: 23.253.99.61
       location:
diff --git a/inventory/service/host_vars/nb04.opendev.org.yaml b/inventory/service/host_vars/nb04.opendev.org.yaml
deleted file mode 100644
index 76bdf697bb..0000000000
--- a/inventory/service/host_vars/nb04.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
-  nb04-opendev-org-main:
-    - nb04.opendev.org
-
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 0e96213da4..9e1e1e62de 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -134,9 +134,6 @@
 - name: letsencrypt updated nb03-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
-- name: letsencrypt updated nb04-opendev-org-main
-  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
 # review-dev
 
 - name: letsencrypt updated review-dev01-opendev-org-main
diff --git a/testinfra/test_nodepool.py b/testinfra/test_nodepool.py
index 999fbef1e2..2bf45a00be 100644
--- a/testinfra/test_nodepool.py
+++ b/testinfra/test_nodepool.py
@@ -14,7 +14,7 @@
 
 import pytest
 
-testinfra_hosts = ['nl01.openstack.org', 'nb04.opendev.org']
+testinfra_hosts = ['nl01.openstack.org', 'nb01.opendev.org']
 
 
 def test_clouds_yaml(host):
@@ -40,20 +40,20 @@ def test_launcher_container_running(host):
     assert 'nodepool-docker_nodepool-launcher_1' in cmd.stdout
 
 def test_builder_container_running(host):
-    if host.backend.get_hostname() != 'nb04.opendev.org':
+    if host.backend.get_hostname() != 'nb01.opendev.org':
         pytest.skip()
 
     cmd = host.run("docker ps -a --format '{{ .Names }}'")
     assert 'nodepool-builder-compose_nodepool-builder_1' in cmd.stdout
 
 def test_builder_webserver_running(host):
-    if host.backend.get_hostname() != 'nb04.opendev.org':
+    if host.backend.get_hostname() != 'nb01.opendev.org':
         pytest.skip()
 
     apache = host.service('apache2')
     assert apache.is_running
 
     cmd = host.run('curl --insecure '
-                   '--resolve nb04.opendev.org:443:127.0.0.1 '
-                   'https://nb04.opendev.org/')
+                   '--resolve nb01.opendev.org:443:127.0.0.1 '
+                   'https://nb01.opendev.org/')
     assert 'Index of /' in cmd.stdout
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 301813ada9..8cb8205b5b 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -251,7 +251,7 @@
           label: ubuntu-bionic
         - name: nl01.openstack.org
           label: ubuntu-xenial
-        - name: nb04.opendev.org
+        - name: nb01.opendev.org
           label: ubuntu-bionic
     required-projects:
       - opendev/ansible-role-puppet
@@ -262,7 +262,7 @@
         host_copy_output:
           '/etc/nodepool/nodepool.yaml': logs
           '/var/log/nodepool/launcher-debug.log': logs
-      nb04.opendev.org:
+      nb01.opendev.org:
         host_copy_output:
           '/etc/nodepool/nodepool.yaml': logs
           '/var/log/nodepool/builder-debug.log': logs