diff --git a/.zuul.yaml b/.zuul.yaml
index 84fb6da..c760788 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,8 +19,8 @@
     parent: opendev-build-docker-image
     description: Build OpenDev Docker images for gear
     requires:
-      - python-base-3.9-bullseye-container-image
-      - python-builder-3.9-bullseye-container-image
+      - python-base-3.11-bookworm-container-image
+      - python-builder-3.11-bookworm-container-image
     provides: gear-container-image
     vars: &gear_opendev_image_vars
       zuul_work_dir: src/opendev.org/opendev/gear
@@ -34,8 +34,8 @@
     parent: opendev-upload-docker-image
     description: Build OpenDev gear Docker images and upload to Docker Hub.
     requires:
-      - python-base-3.9-bullseye-container-image
-      - python-builder-3.9-bullseye-container-image
+      - python-base-3.11-bookworm-container-image
+      - python-builder-3.11-bookworm-container-image
     provides: gear-container-image
     vars: *gear_opendev_image_vars
     secrets:
@@ -61,24 +61,22 @@
     check:
       jobs:
         - tox-linters
-        - tox-py27
-        - tox-py35:
-            nodeset: ubuntu-xenial
-        - tox-py39:
-            nodeset: ubuntu-focal
+        - tox-py36:
+            nodeset: ubuntu-bionic
+        - tox-py311:
+            nodeset: ubuntu-jammy
         - build-python-release:
-            nodeset: ubuntu-focal
+            nodeset: ubuntu-jammy
         - gear-build-opendev-image
     gate:
       jobs:
         - tox-linters
-        - tox-py27
-        - tox-py35:
-            nodeset: ubuntu-xenial
-        - tox-py39:
-            nodeset: ubuntu-focal
+        - tox-py36:
+            nodeset: ubuntu-bionic
+        - tox-py311:
+            nodeset: ubuntu-jammy
         - build-python-release:
-            nodeset: ubuntu-focal
+            nodeset: ubuntu-jammy
         - gear-upload-opendev-image
     promote:
       jobs:
@@ -87,7 +85,7 @@
     release:
       jobs:
         - opendev-release-python:
-            nodeset: ubuntu-focal
+            nodeset: ubuntu-jammy
         - upload-docker-image:
             secrets:
               name: docker_credentials
diff --git a/Dockerfile b/Dockerfile
index 3c75b9f..bd03f93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM opendevorg/python-builder:3.9-bullseye as builder
+FROM opendevorg/python-builder:3.11-bookworm as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM opendevorg/python-base:3.9-bullseye as geard
+FROM opendevorg/python-base:3.11-bookworm as geard
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
diff --git a/bindep.txt b/bindep.txt
index e6c6331..aba02cc 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -3,7 +3,6 @@
 
 libffi-dev [platform:dpkg]
 libffi-devel [platform:rpm]
-python-dev [platform:dpkg]
 python-devel [platform:rpm]
 python3-all-dev [platform:ubuntu !platform:ubuntu-precise]
 python3-dev [platform:dpkg]
diff --git a/setup.cfg b/setup.cfg
index c05a2d3..e68fe1a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,6 +31,8 @@ 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.11
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 54a6ee2..8b6ed66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,10 @@
 [tox]
 minversion = 1.6
-skipsdist = True
 envlist = py3,py27,linters
 ignore_basepython_conflict = true
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
-usedevelop = True
 basepython = python3
 install_command = pip install {opts} {packages}
 deps = -r{toxinidir}/requirements.txt