diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f4c24a7..165e5a6 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -14,16 +14,16 @@
 # limitations under the License.
 
 - job:
-    name: openstack-ansible-dir-centos-8
+    name: openstack-ansible-dir-centos-8-stream
     parent: openstack-ansible-functional
-    nodeset: centos-8
+    nodeset: centos-8-stream
     vars:
       tox_env: dir
 
 - job:
-    name: openstack-ansible-overlayfs-centos-8
+    name: openstack-ansible-overlayfs-centos-8-stream
     parent: openstack-ansible-functional
-    nodeset: centos-8
+    nodeset: centos-8-stream
     vars:
       tox_env: ofs
 
@@ -54,31 +54,3 @@
     nodeset: ubuntu-focal
     vars:
       tox_env: zfs
-
-- job:
-    name: openstack-ansible-dir-ubuntu-bionic
-    parent: openstack-ansible-functional
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: dir
-
-- job:
-    name: openstack-ansible-overlayfs-ubuntu-bionic
-    parent: openstack-ansible-functional
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: ofs
-
-- job:
-    name: openstack-ansible-btrfs-ubuntu-bionic
-    parent: openstack-ansible-functional
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: btrfs
-
-- job:
-    name: openstack-ansible-zfs-ubuntu-bionic
-    parent: openstack-ansible-functional
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: zfs
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1162026..a538d09 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -23,25 +23,18 @@
       - build-release-notes-jobs-python3
     check:
       jobs:
-        - openstack-ansible-dir-centos-8
+        - openstack-ansible-dir-centos-8-stream
         - openstack-ansible-dir-ubuntu-bionic
         - openstack-ansible-dir-ubuntu-focal
-        - openstack-ansible-overlayfs-centos-8
-        - openstack-ansible-overlayfs-ubuntu-bionic
+        - openstack-ansible-overlayfs-centos-8-stream
         - openstack-ansible-overlayfs-ubuntu-focal
-        - openstack-ansible-btrfs-ubuntu-bionic
         - openstack-ansible-btrfs-ubuntu-focal
-        - openstack-ansible-zfs-ubuntu-bionic
         - openstack-ansible-zfs-ubuntu-focal
     gate:
       jobs:
-        - openstack-ansible-dir-centos-8
-        - openstack-ansible-dir-ubuntu-bionic
+        - openstack-ansible-dir-centos-8-stream
         - openstack-ansible-dir-ubuntu-focal
-        - openstack-ansible-overlayfs-centos-8
-        - openstack-ansible-overlayfs-ubuntu-bionic
+        - openstack-ansible-overlayfs-centos-8-stream
         - openstack-ansible-overlayfs-ubuntu-focal
-        - openstack-ansible-btrfs-ubuntu-bionic
         - openstack-ansible-btrfs-ubuntu-focal
-        - openstack-ansible-zfs-ubuntu-bionic
         - openstack-ansible-zfs-ubuntu-focal