diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml
deleted file mode 100644
index 343b554315..0000000000
--- a/nodepool/nb04.opendev.org.yaml
+++ /dev/null
@@ -1,386 +0,0 @@
-elements-dir: /etc/nodepool/elements
-images-dir: /opt/nodepool_dib
-
-zookeeper-servers:
-  - host: zk01.openstack.org
-    port: 2181
-  - host: zk02.openstack.org
-    port: 2181
-  - host: zk03.openstack.org
-    port: 2181
-
-providers:
-  - name: citycloud-kna1
-    region-name: 'Kna1'
-    cloud: citycloud
-    rate: 0.25
-    # Disabled until 2018-07-01 at request of citycloud.
-    # We should contact them before reenabling at this date.
-    diskimages: []
-
-  - name: citycloud-lon1
-    region-name: 'Lon1'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: []
-
-  - name: citycloud-sto2
-    region-name: 'Sto2'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: []
-
-  - name: ovh-bhs1
-    region-name: 'BHS1'
-    cloud: ovh
-    rate: 0.1
-    diskimages: &provider_diskimages
-      - name: centos-7
-        config-drive: true
-      - name: centos-8
-        config-drive: true
-      - name: centos-8-plain
-        config-drive: true
-      - name: debian-buster
-        config-drive: true
-      - name: debian-stretch
-        config-drive: true
-      - name: fedora-30
-        config-drive: true
-      - name: fedora-31
-        config-drive: true
-      - name: gentoo-17-0-systemd
-        config-drive: true
-      - name: opensuse-15
-        config-drive: true
-      - name: opensuse-15-plain
-        config-drive: true
-      - name: opensuse-tumbleweed
-        config-drive: true
-      - name: ubuntu-bionic
-        config-drive: true
-      - name: ubuntu-bionic-plain
-        config-drive: true
-      - name: ubuntu-focal
-        config-drive: true
-      - name: ubuntu-xenial
-        config-drive: true
-      - name: ubuntu-xenial-plain
-        config-drive: true
-
-  - name: ovh-gra1
-    region-name: 'GRA1'
-    cloud: ovh
-    rate: 0.1
-    diskimages: *provider_diskimages
-
-  - name: inap-mtl01
-    region-name: 'mtl01'
-    cloud: inap
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: rax-dfw
-    region-name: 'DFW'
-    cloud: rax
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: rax-iad
-    region-name: 'IAD'
-    cloud: rax
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: rax-ord
-    region-name: 'ORD'
-    cloud: rax
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: vexxhost-ca-ymq-1
-    region-name: 'ca-ymq-1'
-    cloud: vexxhost
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: vexxhost-sjc1
-    region-name: 'sjc1'
-    cloud: vexxhost
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: limestone-regionone
-    region-name: 'RegionOne'
-    cloud: limestone
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: openedge-us-east
-    region-name: 'us-east'
-    cloud: openedge
-    rate: 0.001
-    diskimages: *provider_diskimages
-
-  - name: airship-kna1
-    region-name: 'Kna1'
-    cloud: airship-citycloud
-    rate: 0.25
-    diskimages: *provider_diskimages
-
-diskimages:
-  - name: base
-    abstract: True
-    elements:
-      - vm
-      - simple-init
-      - openstack-repos
-      - nodepool-base
-      - growroot
-      - infra-package-needs
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_CHECKSUM: '1'
-      DIB_IMAGE_CACHE: /opt/dib_cache
-      DIB_JOURNAL_SIZE: '512'
-      DIB_GRUB_TIMEOUT: '0'
-      GIT_HTTP_LOW_SPEED_TIME: '300'
-      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
-      DIB_SHOW_IMAGE_USAGE: '1'
-      ZUUL_USER_SSH_PUBLIC_KEY: |
-        ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDh5u0DWNi0d3uqI82izAxVTUTrGl36L3szEqV9WrilGmxaTtp9X7HrktJ5J+rvxQqz39llTf1v7iYA4CNKto/48RBAB0mKEEI4x4iw+fu/BLU7nu7ewSfXLUxHahxaTgIk2KcbegknD5NzMjalyfNfgTPDGv8BjwHeeNdZmJMBvPFGu6fO48M4yK1tiQn0kAkaH4oII/M4pyF8vy9tPTODAD7RvnMvQAb08LZZvE/IPzJAHNXFRb1v+DBa38fOvdyaz/nibrsxiOWZxQVLgjYciUeDy1xvXADaWlqvxmLy+90LHbJFbGxK4AN0mWfwBiUMVyxZjkun39pjTNl2k09OhOq+R52UqnehMc4eBdZCddnCUq4/efbFCJkqe5wY+SE8fYybJjauUL64zyrwf6yfWkXvPVHWa9Y+NCmvH8PCBUcsQnwO7l/Yb4N+8+u6zkODyuc9wLAY+DpnptE3plXtvUs5negC4fvJSnOHpWXuoi9yzp7IlPf6fSjMMDQo0JjCYJwazdzqrIH2VSCcfHAqWF0ECR8IgwZV1bp0xFe0UN0Gjsgkozqf8rvs1AYyTSeD19Wg9j+crTke8E1sfoI/qFzHwzBQFKJ+2l0cs7pZWJBARlhbt1j1IouS2aH+74xwsavRhBz4IsFTPqWiP6JTrgk5cgKRnTqInzNfdaLeUw== zuul-worker@openstack.org
-
-  - name: base-debuntu
-    abstract: True
-    parent: base
-    env-vars:
-      DIB_APT_LOCAL_CACHE: '0'
-      DIB_DISABLE_APT_CLEANUP: '1'
-      DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
-
-  # NOTE(ianw) 2020-02-17: we are working to remove pip-and-virtualenv
-  # as a requirement; as we cut images over we can remove these.
-  - name: base-with-pip
-    abstract: True
-    parent: base
-    elements:
-      - pip-and-virtualenv
-
-  - name: base-debuntu-with-pip
-    abstract: True
-    parent: base-debuntu
-    elements:
-      - pip-and-virtualenv
-
-
-  ############ CentOS and Fedora #############
-
-  - name: centos-7
-    parent: base-with-pip
-    pause: true
-    elements:
-      - centos-minimal
-      - epel
-      - cache-devstack
-    env-vars:
-      DIB_EPEL_DISABLED: '1'
-
-  - name: centos-8
-    parent: base-with-pip
-    pause: true
-    python-path: /usr/bin/python3
-    release: '8'
-    elements:
-      - cache-devstack
-      - centos-minimal
-      - epel
-    env-vars:
-      DIB_EPEL_DISABLED: '1'
-
-  - name: fedora-30
-    parent: base-with-pip
-    pause: false
-    python-path: /usr/bin/python3
-    elements:
-      - fedora-minimal
-      - cache-devstack
-    release: 30
-
-  - name: fedora-31
-    parent: base
-    pause: false
-    python-path: /usr/bin/python3
-    elements:
-      - fedora-minimal
-      - cache-devstack
-    release: 31
-
-  ############ Debian #############
-
-  - name: debian-stretch
-    parent: base-debuntu-with-pip
-    pause: true
-    elements:
-      - debian-minimal
-      - cache-devstack
-    release: stretch
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/debian'
-      DIB_DEBIAN_SECURITY_MIRROR:
-        'http://mirror.dfw.rax.openstack.org/debian-security'
-      DIB_DEBIAN_SECURITY_SUBPATH: ''
-
-  - name: debian-buster
-    parent: base-debuntu-with-pip
-    pause: true
-    elements:
-      - debian-minimal
-      - cache-devstack
-    release: buster
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/debian'
-      DIB_DEBIAN_SECURITY_MIRROR:
-        'http://mirror.dfw.rax.openstack.org/debian-security'
-      DIB_DEBIAN_SECURITY_SUBPATH: ''
-      DIB_BLOCK_DEVICE_CONFIG: |
-        # Default single partition loopback
-
-        - local_loop:
-            name: image0
-
-        - partitioning:
-            base: image0
-            label: mbr
-            partitions:
-              - name: root
-                flags: [ boot, primary ]
-                size: 100%
-                mkfs:
-                  mount:
-                    mount_point: /
-                    fstab:
-                      options: "defaults,nobarrier,noatime"
-                      fsck-passno: 1
-
-
-  ############ Gentoo #############
-
-  - name: gentoo-17-0-systemd
-    parent: base-with-pip
-    pause: true
-    elements:
-      - gentoo
-    env-vars:
-      GENTOO_PYTHON_TARGETS: 'python2_7 python3_6'
-      GENTOO_PYTHON_ACTIVE_VERSION: python3.6
-      GENTOO_PROFILE: 'default/linux/amd64/17.1/systemd'
-
-
-  ############ openSUSE #############
-
-  - name: opensuse-15
-    parent: base-with-pip
-    pause: true
-    elements:
-      - opensuse-minimal
-      - cache-devstack
-    release: '15.1'
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
-
-  - name: opensuse-tumbleweed
-    parent: base
-    pause: true
-    elements:
-      - opensuse-minimal
-      - cache-devstack
-    release: 'tumbleweed'
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
-
-
-  ############ Ubuntu #############
-
-  - name: ubuntu-bionic
-    parent: base-debuntu-with-pip
-    pause: true
-    elements:
-      - ubuntu-minimal
-      - cache-devstack
-    release: bionic
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-
-  - name: ubuntu-focal
-    parent: base-debuntu
-    pause: false
-    elements:
-      - ubuntu-minimal
-      - cache-devstack
-    release: focal
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-
-  - name: ubuntu-xenial
-    parent: base-debuntu-with-pip
-    pause: true
-    elements:
-      - ubuntu-minimal
-      - cache-devstack
-    release: xenial
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-
-
-  ############ Plain images #############
-
-  # NOTE(ianw) 2020-03-16 : these are alternative images without the
-  # pip-and-virtualenv element we can test ansible roles to achieve
-  # full backwards-compatability with.
-
-  - name: ubuntu-bionic-plain
-    parent: base-debuntu
-    pause: false
-    elements:
-      - ubuntu-minimal
-      - cache-devstack
-    release: bionic
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-
-  - name: ubuntu-xenial-plain
-    parent: base-debuntu
-    pause: false
-    elements:
-      - ubuntu-minimal
-      - cache-devstack
-    release: xenial
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-
-  - name: opensuse-15-plain
-    parent: base
-    pause: false
-    elements:
-      - opensuse-minimal
-      - cache-devstack
-    release: '15.1'
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
-
-  - name: centos-8-plain
-    parent: base
-    pause: false
-    python-path: /usr/bin/python3
-    release: '8'
-    elements:
-      - cache-devstack
-      - centos-minimal
-      - epel
-    env-vars:
-      DIB_EPEL_DISABLED: '1'
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index fcb9680a8e..6826645125 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -197,22 +197,18 @@ diskimages:
     env-vars:
       DIB_EPEL_DISABLED: '1'
 
-  # NOTE(ianw) : currently only building on nb04.opendev.org; see that
-  # config file.
   - name: fedora-30
     parent: base-with-pip
-    pause: true
+    pause: false
     python-path: /usr/bin/python3
     elements:
       - fedora-minimal
       - cache-devstack
     release: 30
 
-  # NOTE(ianw) : currently only building on nb04.opendev.org; see that
-  # config file.
   - name: fedora-31
     parent: base
-    pause: true
+    pause: false
     python-path: /usr/bin/python3
     elements:
       - fedora-minimal
@@ -271,7 +267,7 @@ diskimages:
 
   - name: gentoo-17-0-systemd
     parent: base-with-pip
-    pause: false
+    pause: true
     elements:
       - gentoo
     env-vars:
@@ -338,18 +334,53 @@ diskimages:
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
+
   ############ Plain images #############
 
-  # NOTE : these only build on nb04; see that configuration file
+  # NOTE(ianw) 2020-03-16 : these are alternative images without the
+  # pip-and-virtualenv element we can test ansible roles to achieve
+  # full backwards-compatability with.
 
   - name: ubuntu-bionic-plain
-    pause: true
+    parent: base-debuntu
+    pause: false
+    elements:
+      - ubuntu-minimal
+      - cache-devstack
+    release: bionic
+    env-vars:
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
+      DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-xenial-plain
-    pause: true
+    parent: base-debuntu
+    pause: false
+    elements:
+      - ubuntu-minimal
+      - cache-devstack
+    release: xenial
+    env-vars:
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/ubuntu'
+      DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: opensuse-15-plain
-    pause: true
+    parent: base
+    pause: false
+    elements:
+      - opensuse-minimal
+      - cache-devstack
+    release: '15.1'
+    env-vars:
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
 
   - name: centos-8-plain
-    pause: true
+    parent: base
+    pause: false
+    python-path: /usr/bin/python3
+    release: '8'
+    elements:
+      - cache-devstack
+      - centos-minimal
+      - epel
+    env-vars:
+      DIB_EPEL_DISABLED: '1'