diff --git a/.zuul.yaml b/.zuul.yaml
index 6076922..280ddbb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -31,6 +31,8 @@
       - zuul-container-image
       - zuul-registry-container-image
       - nodepool-container-image
+      - python-builder-3.10-bullseye-container-image
+      - python-base-3.10-bullseye-container-image
     provides:
       - zuul-operator-container-image
     vars: &image_vars
@@ -75,6 +77,8 @@
       - nodepool-container-image
     provides:
       - zuul-operator-container-image
+      - python-builder-3.10-bullseye-container-image
+      - python-base-3.10-bullseye-container-image
     vars: *image_vars
 
 - job:
diff --git a/build/Dockerfile b/build/Dockerfile
index 67a1f58..e0f9da3 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/opendevorg/python-builder:3.8 as builder
+FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.8
+FROM docker.io/opendevorg/python-base:3.10-bullseye
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
diff --git a/setup.cfg b/setup.cfg
index 24047e2..7b6711d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,6 +30,7 @@ classifier =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3 :: Only
     Topic :: Software Development :: Quality Assurance
     Topic :: Software Development :: Testing