diff --git a/.buildbot/ubuntu/Dockerfile b/.buildbot/ubuntu-focal/Dockerfile
similarity index 100%
rename from .buildbot/ubuntu/Dockerfile
rename to .buildbot/ubuntu-focal/Dockerfile
diff --git a/.buildbot/ubuntu/test.sh b/.buildbot/ubuntu-focal/test.sh
similarity index 100%
rename from .buildbot/ubuntu/test.sh
rename to .buildbot/ubuntu-focal/test.sh
diff --git a/.buildbot/ubuntu-jammy/Dockerfile b/.buildbot/ubuntu-jammy/Dockerfile
new file mode 100644
index 0000000..c07f0b1
--- /dev/null
+++ b/.buildbot/ubuntu-jammy/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:jammy
+
+RUN apt-get update
+
+RUN apt-get install -yq --no-install-suggests --no-install-recommends \
+    python3-dev python3-pip python-is-python3
+
+RUN pip install setuptools wheel
+RUN pip install --upgrade pip tox virtualenv
diff --git a/.buildbot/ubuntu-jammy/test.sh b/.buildbot/ubuntu-jammy/test.sh
new file mode 120000
index 0000000..1f50e17
--- /dev/null
+++ b/.buildbot/ubuntu-jammy/test.sh
@@ -0,0 +1 @@
+../ubuntu-focal/test.sh
\ No newline at end of file