diff --git a/Makefile b/Makefile
index c8c3a1dd47..f24e3b9bc1 100644
--- a/Makefile
+++ b/Makefile
@@ -48,11 +48,11 @@ test-shellcheck:
 
 .PHONY: test-legacy-units
 test-legacy-units:
-	tox run -e py38-legacy
+	tox run -e test-legacy-py310
 
 .PHONY: test-units
 test-units: test-legacy-units
-	tox run -e py38-unit
+	tox run -e test-py310
 
 .PHONY: tests
 tests: tests-static test-units
diff --git a/requirements-devel.txt b/requirements-devel.txt
index 0fbd48d66f..d082b9af39 100644
--- a/requirements-devel.txt
+++ b/requirements-devel.txt
@@ -95,7 +95,7 @@ raven==6.10.0
 requests==2.31.0
 requests-toolbelt==1.0.0
 requests-unixsocket==0.3.0
-ruff==0.0.220
+ruff==0.1.1
 SecretStorage==3.3.3
 simplejson==3.19.1
 six==1.16.0
diff --git a/tools/environment-setup.sh b/tools/environment-setup.sh
index 24abffb7a0..dfe52a4477 100755
--- a/tools/environment-setup.sh
+++ b/tools/environment-setup.sh
@@ -10,7 +10,7 @@ fi
 
 # Create the container.
 if ! lxc info snapcraft-dev >/dev/null 2>&1; then
-    lxc init ubuntu:20.04 snapcraft-dev
+    lxc init ubuntu:22.04 snapcraft-dev
 fi
 if ! lxc config get snapcraft-dev raw.idmap | grep -q "both $UID 1000"; then
     lxc config set snapcraft-dev raw.idmap "both $UID 1000"