diff --git a/zuul.d/docker-images/python.yaml b/zuul.d/docker-images/python-3.7.yaml
similarity index 50%
rename from zuul.d/docker-images/python.yaml
rename to zuul.d/docker-images/python-3.7.yaml
index 19af85a6ba..4baa6bd7c4 100644
--- a/zuul.d/docker-images/python.yaml
+++ b/zuul.d/docker-images/python-3.7.yaml
@@ -39,44 +39,6 @@
     vars: *python-builder_3_7_vars
     files: *python-builder_3_7_files
 
-# python-builder-3.8 jobs
-- job:
-    name: system-config-build-image-python-builder-3.8
-    description: Build a python-builder-3.8 image.
-    parent: system-config-build-image
-    provides:
-      - python-builder-3.8-container-image
-    vars: &python-builder_3_8_vars
-      docker_images:
-        - context: docker/python-builder
-          repository: opendevorg/python-builder
-          tags:
-            - 3.8
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - PYTHON_VERSION=3.8
-    files: &python-builder_3_8_files
-      - docker/python-base/
-      - docker/python-builder/
-
-- job:
-    name: system-config-upload-image-python-builder-3.8
-    description: Build and upload a python-builder-3.8 image.
-    parent: system-config-upload-image
-    provides: python-builder-3.8-container-image
-    vars: *python-builder_3_8_vars
-    files: *python-builder_3_8_files
-
-- job:
-    name: system-config-promote-image-python-builder-3.8
-    description: Promote a previously published python-builder-3.8 image to latest.
-    parent: system-config-promote-image
-    vars: *python-builder_3_8_vars
-    files: *python-builder_3_8_files
-
-# python-base-3.7 jobs
 - job:
     name: system-config-build-image-python-base-3.7
     description: Build a python-base-3.7 image.
@@ -115,43 +77,6 @@
     vars: *python-base-3_7_vars
     files: *python-base-3_7_files
 
-# python-base-3.8 jobs
-- job:
-    name: system-config-build-image-python-base-3.8
-    description: Build a python-base-3.8 image.
-    parent: system-config-build-image
-    provides: python-base-3.8-container-image
-    vars: &python-base-3_8_vars
-      docker_images:
-        - context: docker/python-base
-          repository: opendevorg/python-base
-          tags:
-            - 3.8
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - PYTHON_VERSION=3.8
-    files: &python-base-3_8_files
-      - docker/python-base/
-      - docker/python-builder/
-
-- job:
-    name: system-config-upload-image-python-base-3.8
-    description: Build and upload a python-base-3.8 image.
-    parent: system-config-upload-image
-    provides: python-base-3.8-container-image
-    vars: *python-base-3_8_vars
-    files: *python-base-3_8_files
-
-- job:
-    name: system-config-promote-image-python-base-3.8
-    description: Promote a previously published python-base-3.8 image to latest.
-    parent: system-config-promote-image
-    vars: *python-base-3_8_vars
-    files: *python-base-3_8_files
-
-# uwsgi-base-3.7 jobs
 - job:
     name: system-config-build-image-uwsgi-base-3.7
     description: Build a uwsgi-base-3.7 image.
@@ -202,54 +127,3 @@
     parent: system-config-promote-image
     vars: *uwsgi-base_3_7_vars
     files: *uwsgi-base_3_7_files
-
-# uwsgi-base-3.8 jobs
-- job:
-    name: system-config-build-image-uwsgi-base-3.8
-    description: Build a uwsgi-base-3.8 image.
-    parent: system-config-build-image
-    provides: uwsgi-base-3.8-container-image
-    requires: &uwsgi-base_3_8_requires
-      - python-base-3.8-container-image
-      - python-builder-3.8-container-image
-    dependencies:
-      - name: system-config-build-image-python-base-3.8
-        soft: true
-      - name: system-config-build-image-python-builder-3.8
-        soft: true
-    vars: &uwsgi-base_3_8_vars
-      docker_images:
-        - context: docker/uwsgi-base
-          repository: opendevorg/uwsgi-base
-          tags:
-            - 3.8
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - PYTHON_VERSION=3.8
-    files: &uwsgi-base_3_8_files
-      - docker/python-base/.*
-      - docker/python-builder/.*
-      - docker/uwsgi-base/.*
-
-- job:
-    name: system-config-upload-image-uwsgi-base-3.8
-    description: Build and upload a uwsgi-base-3.8 image.
-    parent: system-config-upload-image
-    provides: uwsgi-base-3.8-container-image
-    requires: *uwsgi-base_3_8_requires
-    dependencies:
-      - name: system-config-upload-image-python-base-3.8
-        soft: true
-      - name: system-config-upload-image-python-builder-3.8
-        soft: true
-    vars: *uwsgi-base_3_8_vars
-    files: *uwsgi-base_3_8_files
-
-- job:
-    name: system-config-promote-image-uwsgi-base-3.8
-    description: Promote a previously published uwsgi-base-3.8 image to latest.
-    parent: system-config-promote-image
-    vars: *uwsgi-base_3_8_vars
-    files: *uwsgi-base_3_8_files
diff --git a/zuul.d/docker-images/python-3.8.yaml b/zuul.d/docker-images/python-3.8.yaml
new file mode 100644
index 0000000000..c237e943a6
--- /dev/null
+++ b/zuul.d/docker-images/python-3.8.yaml
@@ -0,0 +1,120 @@
+- job:
+    name: system-config-build-image-python-builder-3.8
+    description: Build a python-builder-3.8 image.
+    parent: system-config-build-image
+    provides:
+      - python-builder-3.8-container-image
+    vars: &python-builder_3_8_vars
+      docker_images:
+        - context: docker/python-builder
+          repository: opendevorg/python-builder
+          tags:
+            - 3.8
+          arch:
+            - linux/amd64
+            - linux/arm64
+          build_args:
+            - PYTHON_VERSION=3.8
+    files: &python-builder_3_8_files
+      - docker/python-base/
+      - docker/python-builder/
+
+- job:
+    name: system-config-upload-image-python-builder-3.8
+    description: Build and upload a python-builder-3.8 image.
+    parent: system-config-upload-image
+    provides: python-builder-3.8-container-image
+    vars: *python-builder_3_8_vars
+    files: *python-builder_3_8_files
+
+- job:
+    name: system-config-promote-image-python-builder-3.8
+    description: Promote a previously published python-builder-3.8 image to latest.
+    parent: system-config-promote-image
+    vars: *python-builder_3_8_vars
+    files: *python-builder_3_8_files
+
+- job:
+    name: system-config-build-image-python-base-3.8
+    description: Build a python-base-3.8 image.
+    parent: system-config-build-image
+    provides: python-base-3.8-container-image
+    vars: &python-base-3_8_vars
+      docker_images:
+        - context: docker/python-base
+          repository: opendevorg/python-base
+          tags:
+            - 3.8
+          arch:
+            - linux/amd64
+            - linux/arm64
+          build_args:
+            - PYTHON_VERSION=3.8
+    files: &python-base-3_8_files
+      - docker/python-base/
+      - docker/python-builder/
+
+- job:
+    name: system-config-upload-image-python-base-3.8
+    description: Build and upload a python-base-3.8 image.
+    parent: system-config-upload-image
+    provides: python-base-3.8-container-image
+    vars: *python-base-3_8_vars
+    files: *python-base-3_8_files
+
+- job:
+    name: system-config-promote-image-python-base-3.8
+    description: Promote a previously published python-base-3.8 image to latest.
+    parent: system-config-promote-image
+    vars: *python-base-3_8_vars
+    files: *python-base-3_8_files
+
+- job:
+    name: system-config-build-image-uwsgi-base-3.8
+    description: Build a uwsgi-base-3.8 image.
+    parent: system-config-build-image
+    provides: uwsgi-base-3.8-container-image
+    requires: &uwsgi-base_3_8_requires
+      - python-base-3.8-container-image
+      - python-builder-3.8-container-image
+    dependencies:
+      - name: system-config-build-image-python-base-3.8
+        soft: true
+      - name: system-config-build-image-python-builder-3.8
+        soft: true
+    vars: &uwsgi-base_3_8_vars
+      docker_images:
+        - context: docker/uwsgi-base
+          repository: opendevorg/uwsgi-base
+          tags:
+            - 3.8
+          arch:
+            - linux/amd64
+            - linux/arm64
+          build_args:
+            - PYTHON_VERSION=3.8
+    files: &uwsgi-base_3_8_files
+      - docker/python-base/.*
+      - docker/python-builder/.*
+      - docker/uwsgi-base/.*
+
+- job:
+    name: system-config-upload-image-uwsgi-base-3.8
+    description: Build and upload a uwsgi-base-3.8 image.
+    parent: system-config-upload-image
+    provides: uwsgi-base-3.8-container-image
+    requires: *uwsgi-base_3_8_requires
+    dependencies:
+      - name: system-config-upload-image-python-base-3.8
+        soft: true
+      - name: system-config-upload-image-python-builder-3.8
+        soft: true
+    vars: *uwsgi-base_3_8_vars
+    files: *uwsgi-base_3_8_files
+
+- job:
+    name: system-config-promote-image-uwsgi-base-3.8
+    description: Promote a previously published uwsgi-base-3.8 image to latest.
+    parent: system-config-promote-image
+    vars: *uwsgi-base_3_8_vars
+    files: *uwsgi-base_3_8_files
diff --git a/zuul.d/docker-images/python-3.9.yaml b/zuul.d/docker-images/python-3.9.yaml
new file mode 100644
index 0000000000..af838bc18d
--- /dev/null
+++ b/zuul.d/docker-images/python-3.9.yaml
@@ -0,0 +1,120 @@
+- job:
+    name: system-config-build-image-python-builder-3.9
+    description: Build a python-builder-3.9 image.
+    parent: system-config-build-image
+    provides:
+      - python-builder-3.9-container-image
+    vars: &python-builder_3_9_vars
+      docker_images:
+        - context: docker/python-builder
+          repository: opendevorg/python-builder
+          tags:
+            - 3.9
+          arch:
+            - linux/amd64
+            - linux/arm64
+          build_args:
+            - PYTHON_VERSION=3.9
+    files: &python-builder_3_9_files
+      - docker/python-base/
+      - docker/python-builder/
+
+- job:
+    name: system-config-upload-image-python-builder-3.9
+    description: Build and upload a python-builder-3.9 image.
+    parent: system-config-upload-image
+    provides: python-builder-3.9-container-image
+    vars: *python-builder_3_9_vars
+    files: *python-builder_3_9_files
+
+- job:
+    name: system-config-promote-image-python-builder-3.9
+    description: Promote a previously published python-builder-3.9 image to latest.
+    parent: system-config-promote-image
+    vars: *python-builder_3_9_vars
+    files: *python-builder_3_9_files
+
+- job:
+    name: system-config-build-image-python-base-3.9
+    description: Build a python-base-3.9 image.
+    parent: system-config-build-image
+    provides: python-base-3.9-container-image
+    vars: &python-base-3_9_vars
+      docker_images:
+        - context: docker/python-base
+          repository: opendevorg/python-base
+          tags:
+            - 3.9
+          arch:
+            - linux/amd64
+            - linux/arm64
+          build_args:
+            - PYTHON_VERSION=3.9
+    files: &python-base-3_9_files
+      - docker/python-base/
+      - docker/python-builder/
+
+- job:
+    name: system-config-upload-image-python-base-3.9
+    description: Build and upload a python-base-3.9 image.
+    parent: system-config-upload-image
+    provides: python-base-3.9-container-image
+    vars: *python-base-3_9_vars
+    files: *python-base-3_9_files
+
+- job:
+    name: system-config-promote-image-python-base-3.9
+    description: Promote a previously published python-base-3.9 image to latest.
+    parent: system-config-promote-image
+    vars: *python-base-3_9_vars
+    files: *python-base-3_9_files
+
+- job:
+    name: system-config-build-image-uwsgi-base-3.9
+    description: Build a uwsgi-base-3.9 image.
+    parent: system-config-build-image
+    provides: uwsgi-base-3.9-container-image
+    requires: &uwsgi-base_3_9_requires
+      - python-base-3.9-container-image
+      - python-builder-3.9-container-image
+    dependencies:
+      - name: system-config-build-image-python-base-3.9
+        soft: true
+      - name: system-config-build-image-python-builder-3.9
+        soft: true
+    vars: &uwsgi-base_3_9_vars
+      docker_images:
+        - context: docker/uwsgi-base
+          repository: opendevorg/uwsgi-base
+          tags:
+            - 3.9
+          arch:
+            - linux/amd64
+            - linux/arm64
+          build_args:
+            - PYTHON_VERSION=3.9
+    files: &uwsgi-base_3_9_files
+      - docker/python-base/.*
+      - docker/python-builder/.*
+      - docker/uwsgi-base/.*
+
+- job:
+    name: system-config-upload-image-uwsgi-base-3.9
+    description: Build and upload a uwsgi-base-3.9 image.
+    parent: system-config-upload-image
+    provides: uwsgi-base-3.9-container-image
+    requires: *uwsgi-base_3_9_requires
+    dependencies:
+      - name: system-config-upload-image-python-base-3.9
+        soft: true
+      - name: system-config-upload-image-python-builder-3.9
+        soft: true
+    vars: *uwsgi-base_3_9_vars
+    files: *uwsgi-base_3_9_files
+
+- job:
+    name: system-config-promote-image-uwsgi-base-3.9
+    description: Promote a previously published uwsgi-base-3.9 image to latest.
+    parent: system-config-promote-image
+    vars: *uwsgi-base_3_9_vars
+    files: *uwsgi-base_3_9_files
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 662ddc2a27..8bbfa29fc1 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -118,10 +118,13 @@
                 soft: true
         - system-config-build-image-python-base-3.7
         - system-config-build-image-python-base-3.8
+        - system-config-build-image-python-base-3.9
         - system-config-build-image-python-builder-3.7
         - system-config-build-image-python-builder-3.8
+        - system-config-build-image-python-builder-3.9
         - system-config-build-image-uwsgi-base-3.7
         - system-config-build-image-uwsgi-base-3.8
+        - system-config-build-image-uwsgi-base-3.9
     check-arm64:
       jobs:
         - system-config-run-base-arm64
@@ -233,10 +236,13 @@
                 soft: true
         - system-config-upload-image-python-base-3.7
         - system-config-upload-image-python-base-3.8
+        - system-config-upload-image-python-base-3.9
         - system-config-upload-image-python-builder-3.7
         - system-config-upload-image-python-builder-3.8
+        - system-config-upload-image-python-builder-3.9
         - system-config-upload-image-uwsgi-base-3.7
         - system-config-upload-image-uwsgi-base-3.8
+        - system-config-upload-image-uwsgi-base-3.9
     promote:
       jobs:
         - opendev-promote-docs
@@ -254,10 +260,13 @@
         - system-config-promote-image-refstack
         - system-config-promote-image-python-base-3.7
         - system-config-promote-image-python-base-3.8
+        - system-config-promote-image-python-base-3.9
         - system-config-promote-image-python-builder-3.7
         - system-config-promote-image-python-builder-3.8
+        - system-config-promote-image-python-builder-3.9
         - system-config-promote-image-uwsgi-base-3.7
         - system-config-promote-image-uwsgi-base-3.8
+        - system-config-promote-image-uwsgi-base-3.9
         - infra-prod-install-ansible
         - infra-prod-base
         - infra-prod-letsencrypt