diff --git a/.zuul.yaml b/.zuul.yaml
index 540530d..289c10f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,8 +20,8 @@
     description: Build OpenDev Docker images for LodgeIt
     dependencies: opendev-buildset-registry
     requires:
-      - python-builder-3.8-bullseye-container-image
-      - uwsgi-base-3.8-bullseye-container-image
+      - python-builder-3.10-bullseye-container-image
+      - uwsgi-base-3.10-bullseye-container-image
     provides: lodgeit-container-image
     vars: &lodgeit_opendev_image_vars
       zuul_work_dir: src/opendev.org/opendev/lodgeit
@@ -36,8 +36,8 @@
     description: Build OpenDev LodgeIt Docker images and upload to Docker Hub.
     dependencies: opendev-buildset-registry
     requires:
-      - python-builder-3.8-bullseye-container-image
-      - uwsgi-base-3.8-bullseye-container-image
+      - python-builder-3.10-bullseye-container-image
+      - uwsgi-base-3.10-bullseye-container-image
     provides: lodgeit-container-image
     vars: *lodgeit_opendev_image_vars
     secrets:
@@ -63,6 +63,7 @@
             nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
+        - tox-py310
         - opendev-buildset-registry
         - lodgeit-build-opendev-image
     gate:
@@ -72,6 +73,7 @@
             nodeset: ubuntu-bionic
         - tox-py38:
             nodeset: ubuntu-focal
+        - tox-py310
         - opendev-buildset-registry
         - lodgeit-upload-opendev-image
     promote:
diff --git a/Dockerfile b/Dockerfile
index c37280f..8b90caa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,11 +15,11 @@
 
 # Thu Dec  9 23:48:42 UTC 2021 Rebuild Timestamp
 
-FROM opendevorg/python-builder:3.8-bullseye as builder
+FROM opendevorg/python-builder:3.10-bullseye as builder
 COPY . /tmp/src
 RUN assemble
 
-FROM opendevorg/uwsgi-base:3.8-bullseye as lodgeit
+FROM opendevorg/uwsgi-base:3.10-bullseye as lodgeit
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
 
diff --git a/setup.cfg b/setup.cfg
index cc4e4ed..da0ef6a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,8 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 [entry_points]
 wsgi_scripts =
     lodgeit-wsgi = lodgeit.application:make_app
diff --git a/tox.ini b/tox.ini
index f03e6c7..17739f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pep8, py36, py38
+envlist = pep8, py36, py38, py310
 skipsdist = True
 
 [testenv]