diff --git a/.buildbot/ubuntu/Dockerfile b/.buildbot/ubuntu/Dockerfile
index e9ab2d2..803ecbc 100644
--- a/.buildbot/ubuntu/Dockerfile
+++ b/.buildbot/ubuntu/Dockerfile
@@ -1,16 +1,21 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 RUN apt-get update
 
 RUN apt-get install -yq software-properties-common
 
-RUN apt-add-repository ppa:purplei2p/i2pd
-RUN apt-get update
+RUN apt-add-repository ppa:purplei2p/i2pd && apt-get update -qq
 
 RUN apt-get install -yq --no-install-suggests --no-install-recommends \
-    python3-dev python3-pip python3.9 python3.9-dev python3.9-venv sudo i2pd
+    python3-dev python3-pip python-is-python3 python3.11-dev python3.11-venv
+
+RUN apt-get install -yq --no-install-suggests --no-install-recommends sudo i2pd
 
 RUN echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
-RUN python3.9 -m pip install setuptools wheel
-RUN python3.9 -m pip install --upgrade pip tox virtualenv
+RUN pip install setuptools wheel
+RUN pip install --upgrade pip tox virtualenv
+
+ADD . .
+
+CMD .buildbot/ubuntu/test.sh
diff --git a/tox.ini b/tox.ini
index caeb4c6..6843306 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = reset,py{36,37,38,39,310},stats
+envlist = reset,py3{6,7,8,9,10,11},stats
 skip_missing_interpreters = true
 
 [testenv]