diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3ecbafbb..d18f41db 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,13 +19,6 @@
     vars:
       osa_test_repo: "openstack/openstack-ansible-lxc_container_create"
 
-- job:
-    name: openstack-ansible-lxc-dir-ubuntu-bionic
-    parent: openstack-ansible-lxc-container-create
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: dir
-
 - job:
     name: openstack-ansible-lxc-dir-ubuntu-focal
     parent: openstack-ansible-lxc-container-create
@@ -34,33 +27,18 @@
       tox_env: dir
 
 - job:
-    name: openstack-ansible-lxc-dir-centos-8
+    name: openstack-ansible-lxc-dir-centos-8-stream
     parent: openstack-ansible-lxc-container-create
-    nodeset: centos-8
+    nodeset: centos-8-stream
     vars:
       tox_env: dir
 
-- job:
-    name: openstack-ansible-lxc-btrfs-ubuntu-bionic
-    parent: openstack-ansible-lxc-container-create
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: btrfs
-
 - job:
     name: openstack-ansible-lxc-btrfs-ubuntu-focal
     parent: openstack-ansible-lxc-container-create
     nodeset: ubuntu-focal
     vars:
       tox_env: btrfs
-
-- job:
-    name: openstack-ansible-lxc-overlayfs-ubuntu-bionic
-    parent: openstack-ansible-lxc-container-create
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: ofs
-
 - job:
     name: openstack-ansible-lxc-overlayfs-ubuntu-focal
     parent: openstack-ansible-lxc-container-create
@@ -68,13 +46,6 @@
     vars:
       tox_env: ofs
 
-- job:
-    name: openstack-ansible-lxc-zfs-ubuntu-bionic
-    parent: openstack-ansible-lxc-container-create
-    nodeset: ubuntu-bionic
-    vars:
-      tox_env: zfs
-
 - job:
     name: openstack-ansible-lxc-zfs-ubuntu-focal
     parent: openstack-ansible-lxc-container-create
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b3558fd1..7720c70c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -23,12 +23,8 @@
       - openstack-ansible-upgrade-infra_lxc-jobs
     check:
       jobs:
-        - openstack-ansible-lxc-dir-centos-8
-        - openstack-ansible-lxc-dir-ubuntu-bionic
+        - openstack-ansible-lxc-dir-centos-8-stream
         - openstack-ansible-lxc-dir-ubuntu-focal
-        - openstack-ansible-lxc-btrfs-ubuntu-bionic
         - openstack-ansible-lxc-btrfs-ubuntu-focal
-        - openstack-ansible-lxc-overlayfs-ubuntu-bionic
         - openstack-ansible-lxc-overlayfs-ubuntu-focal
-        - openstack-ansible-lxc-zfs-ubuntu-bionic
         - openstack-ansible-lxc-zfs-ubuntu-focal