diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst
index 7b311ebec6..0ad46fad6c 100644
--- a/doc/source/nodepool.rst
+++ b/doc/source/nodepool.rst
@@ -12,9 +12,19 @@ At a Glance
 ===========
 
 :Hosts:
-  * nodepool.openstack.org
+  * nl01.openstack.org
+  * nl02.openstack.org
+  * nl03.openstack.org
+  * nl04.openstack.org
+  * nb01.openstack.org
+  * nb02.openstack.org
+  * nb03.openstack.org
+  * zk01.openstack.org
+  * zk02.openstack.org
+  * zk03.openstack.org
 :Puppet:
-  * https://git.openstack.org/cgit/openstack-infra/puppet-openstackci/tree/manifests/nodepool.pp
+  * https://git.openstack.org/cgit/openstack-infra/puppet-openstackci/tree/manifests/nodepool_launcher.pp
+  * https://git.openstack.org/cgit/openstack-infra/puppet-openstackci/tree/manifests/nodepool_builder.pp
 :Configuration:
   * :config:`nodepool/nodepool.yaml`
   * :config:`nodepool/scripts/`
@@ -41,8 +51,8 @@ instances for tests up to the set limits of the CI infrastructure.
 Zookeeper
 =========
 
-Nodepool stores image metadata in ZooKeeper.  We have a one-node
-ZooKeeper "cluster" running on nodepool.openstack.org.
+Nodepool stores image metadata in ZooKeeper.  We have a three-node
+ZooKeeper cluster running on zk01.openstack.org - zk03.openstack.org.
 
 The Nodepool CLI should be sufficient to examine and alter any of the
 information stored in ZooKeeper.  However, in case advanced debugging
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 2b4ea87391..d78962b3fa 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -444,7 +444,6 @@ cacti_hosts:
 - nl02.openstack.org
 - nl03.openstack.org
 - nl04.openstack.org
-- nodepool.openstack.org
 - ns1.openstack.org
 - ns2.openstack.org
 - openstackid.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 9adea2dcab..8332d2af83 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -832,25 +832,6 @@ node /^ns\d+\.opendev\.org$/ {
   }
 }
 
-# Node-OS: trusty
-node 'nodepool.openstack.org' {
-  $group = 'nodepool'
-
-  class { 'openstack_project::server': }
-
-  class { '::zookeeper':
-    # The frequency in hours to look for and purge old snapshots,
-    # defaults to 0 (disabled). The number of retained snapshots can
-    # be separately controlled through snap_retain_count and
-    # defaults to the minimum value of 3. This will quickly fill the
-    # disk in production if not enabled. Works on ZK >=3.4.
-    purge_interval => 6,
-  }
-
-  include openstack_project
-
-}
-
 # Node-OS: xenial
 node /^nl\d+\.openstack\.org$/ {
   $group = 'nodepool'
diff --git a/playbooks/group_vars/graphite.yaml b/playbooks/group_vars/graphite.yaml
index 639d3988cf..083b459346 100644
--- a/playbooks/group_vars/graphite.yaml
+++ b/playbooks/group_vars/graphite.yaml
@@ -14,9 +14,6 @@ iptables_extra_allowed_hosts:
   - hostname: logstash.openstack.org
     port: 8125
     protocol: udp
-  - hostname: nodepool.openstack.org
-    port: 8125
-    protocol: udp
   - hostname: nl01.openstack.org
     port: 8125
     protocol: udp