diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml
index e8dae22797..4b5d669b04 100644
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@@ -38,16 +38,6 @@ labels:
     min-ready: 1
   - name: ubuntu-xenial
     min-ready: 1
-    # 2020-04-28 : temporary node types as we transition from
-    # pip-and-virtualenv element
-  - name: ubuntu-bionic-plain
-    min-ready: 0
-  - name: ubuntu-xenial-plain
-    min-ready: 0
-  - name: centos-7-plain
-    min-ready: 0
-  - name: centos-8-plain
-    min-ready: 0
 
 providers:
   - name: rax-dfw
@@ -81,14 +71,6 @@ providers:
         config-drive: true
       - name: ubuntu-xenial
         config-drive: true
-      - name: ubuntu-bionic-plain
-        config-drive: true
-      - name: ubuntu-xenial-plain
-        config-drive: true
-      - name: centos-7-plain
-        config-drive: true
-      - name: centos-8-plain
-        config-drive: true
     pools:
       - name: main
         max-servers: 140
@@ -153,26 +135,6 @@ providers:
             flavor-name: 'Performance'
             diskimage: ubuntu-xenial
             key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-bionic-plain
-            min-ram: 8192
-            flavor-name: 'Performance'
-            diskimage: ubuntu-bionic-plain
-            key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-xenial-plain
-            min-ram: 8192
-            flavor-name: 'Performance'
-            diskimage: ubuntu-xenial-plain
-            key-name: infra-root-keys-2020-05-13
-          - name: centos-7-plain
-            min-ram: 8192
-            flavor-name: 'Performance'
-            diskimage: centos-7-plain
-            key-name: infra-root-keys-2020-05-13
-          - name: centos-8-plain
-            min-ram: 8192
-            flavor-name: 'Performance'
-            diskimage: centos-8-plain
-            key-name: infra-root-keys-2020-05-13
   - name: rax-iad
     region-name: 'IAD'
     cloud: rax
@@ -211,7 +173,3 @@ diskimages:
   - name: ubuntu-bionic
   - name: ubuntu-focal
   - name: ubuntu-xenial
-  - name: ubuntu-bionic-plain
-  - name: ubuntu-xenial-plain
-  - name: centos-7-plain
-  - name: centos-8-plain
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 4ac8a2747b..269e311faa 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -15,14 +15,10 @@ providers:
     cloud: ovh
     rate: 0.1
     diskimages: &provider_diskimages
-      - name: centos-7-plain
-        config-drive: true
       - 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
@@ -39,14 +35,10 @@ providers:
         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'
@@ -138,22 +130,8 @@ diskimages:
       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 #############
+############ CentOS and Fedora #############
 
   - name: centos-7
     parent: base
@@ -315,55 +293,3 @@ diskimages:
     env-vars:
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.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: 'https://mirror.dfw.rax.opendev.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: 'https://mirror.dfw.rax.opendev.org/ubuntu'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-
-  - name: centos-7-plain
-    parent: base
-    pause: false
-    release: '7'
-    elements:
-      - cache-devstack
-      - centos-minimal
-      - epel
-    env-vars:
-      DIB_EPEL_DISABLED: '1'
-
-  - 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'