diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4d40182..ea78770 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -8,9 +8,9 @@
       tox_envlist: alint
 
 - job:
-    name: tenks-deploy-teardown-ovs-centos8
+    name: tenks-deploy-teardown-ovs-centos8s
     parent: tenks-deploy-teardown-ovs-base
-    nodeset: centos-8
+    nodeset: centos-8-stream
 
 - job:
     name: tenks-deploy-teardown-ovs-ubuntu
@@ -18,9 +18,9 @@
     nodeset: ubuntu-bionic
 
 - job:
-    name: tenks-deploy-teardown-linuxbridge-centos8
+    name: tenks-deploy-teardown-linuxbridge-centos8s
     parent: tenks-deploy-teardown-linuxbridge-base
-    nodeset: centos-8
+    nodeset: centos-8-stream
 
 - job:
     name: tenks-deploy-teardown-linuxbridge-ubuntu
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 12ab48e..b202e24 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -13,13 +13,13 @@
         - openstack-tox-py38
         - openstack-tox-py39
         - tenks-tox-ansible-lint
-        - tenks-deploy-teardown-ovs-centos8
+        - tenks-deploy-teardown-ovs-centos8s
         - tenks-deploy-teardown-ovs-ubuntu
-        - tenks-deploy-teardown-linuxbridge-centos8
+        - tenks-deploy-teardown-linuxbridge-centos8s
         - tenks-deploy-teardown-linuxbridge-ubuntu
         # Until we have ironic jobs using tenks, gate on the kayobe overcloud
         # deploy job, which uses tenks to test bare metal compute provisioning.
-        - kayobe-overcloud-centos8
+        - kayobe-overcloud-centos8s
     gate:
       queue: tenks
       jobs:
@@ -29,10 +29,10 @@
         - openstack-tox-py38
         - openstack-tox-py39
         - tenks-tox-ansible-lint
-        - tenks-deploy-teardown-ovs-centos8
+        - tenks-deploy-teardown-ovs-centos8s
         - tenks-deploy-teardown-ovs-ubuntu
-        - tenks-deploy-teardown-linuxbridge-centos8
+        - tenks-deploy-teardown-linuxbridge-centos8s
         - tenks-deploy-teardown-linuxbridge-ubuntu
         # Until we have ironic jobs using tenks, gate on the kayobe overcloud
         # deploy job, which uses tenks to test bare metal compute provisioning.
-        - kayobe-overcloud-centos8
+        - kayobe-overcloud-centos8s