diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index c1e97b16..f54784cb 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -509,12 +509,12 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - openstack-tox-py39
+        - openstack-tox-py38
         - openstack-tox-py310
     gate:
       jobs:
         - openstack-tox-pep8
-        - openstack-tox-py39
+        - openstack-tox-py38
         - openstack-tox-py310
     post:
       jobs:
@@ -532,7 +532,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/horizon
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/horizon
         - openstack-tox-py310:
@@ -543,7 +543,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/horizon
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/horizon
         - openstack-tox-py310:
@@ -565,7 +565,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/neutron
         - openstack-tox-py310:
@@ -576,7 +576,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/neutron
         - openstack-tox-py310:
@@ -598,7 +598,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/ceilometer
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/ceilometer
         - openstack-tox-py310:
@@ -609,7 +609,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/ceilometer
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/ceilometer
         - openstack-tox-py310:
@@ -638,12 +638,12 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - openstack-tox-py39
+        - openstack-tox-py38
         - openstack-tox-py310
     gate:
       jobs:
         - openstack-tox-pep8
-        - openstack-tox-py39
+        - openstack-tox-py38
         - openstack-tox-py310
 
 - project-template:
@@ -665,12 +665,12 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - openstack-tox-py39
+        - openstack-tox-py38
         - openstack-tox-py310
     gate:
       jobs:
         - openstack-tox-pep8
-        - openstack-tox-py39
+        - openstack-tox-py38
         - openstack-tox-py310
     post:
       jobs:
@@ -699,7 +699,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/horizon
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/horizon
         - openstack-tox-py310:
@@ -710,7 +710,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/horizon
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/horizon
         - openstack-tox-py310:
@@ -743,7 +743,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/neutron
         - openstack-tox-py310:
@@ -754,7 +754,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/neutron
         - openstack-tox-py310:
@@ -787,7 +787,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/ceilometer
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/ceilometer
         - openstack-tox-py310:
@@ -798,7 +798,7 @@
         - openstack-tox-pep8:
             required-projects:
               - openstack/ceilometer
-        - openstack-tox-py39:
+        - openstack-tox-py38:
             required-projects:
               - openstack/ceilometer
         - openstack-tox-py310:
@@ -839,7 +839,7 @@
       And it should not be run instead of the default!
     check-arm64:
       jobs:
-        - openstack-tox-py39-arm64:
+        - openstack-tox-py38-arm64:
             voting: false
         - openstack-tox-py310-arm64:
             voting: false
@@ -864,7 +864,7 @@
       And it should not be run instead of the default!
     check-arm64:
       jobs:
-        - openstack-tox-py39-arm64:
+        - openstack-tox-py38-arm64:
             voting: false
         - openstack-tox-py310-arm64:
             voting: false