diff --git a/.github/workflows/build-and-push-to-docker.yml b/.github/workflows/build-and-push-to-docker.yml
index 35a92463..844bcce0 100644
--- a/.github/workflows/build-and-push-to-docker.yml
+++ b/.github/workflows/build-and-push-to-docker.yml
@@ -63,6 +63,8 @@ jobs:
       fail-fast: true
       matrix:
         include:
+        - BASE_PYTHON_VERSION: "3.12"
+          REGISTRY: quay.io
         - BASE_PYTHON_VERSION: "3.11"
           REGISTRY: quay.io
         - BASE_PYTHON_VERSION: "3.10"
@@ -199,14 +201,14 @@ jobs:
       fail-fast: true
       matrix:
         include:
+        - BASE_PYTHON_VERSION: "3.12"
+          REGISTRY: quay.io
         - BASE_PYTHON_VERSION: "3.11"
           REGISTRY: quay.io
         - BASE_PYTHON_VERSION: "3.10"
           REGISTRY: docker.io
         - BASE_PYTHON_VERSION: "3.9"
           REGISTRY: docker.io
-        - BASE_PYTHON_VERSION: "3.8"
-          REGISTRY: docker.io
     steps:
       - name: Docker Login
         uses: docker/login-action@v3
@@ -368,6 +370,8 @@ jobs:
             PYTHON_VERSION: "3.10"
           - EXTENSION: vnc
             PYTHON_VERSION: "3.11"
+          - EXTENSION: vnc
+            PYTHON_VERSION: "3.12"
           - EXTENSION: batch
             PYTHON_VERSION: "3.10"
     steps: