diff --git a/tox-maven/Dockerfile b/tox-maven/Dockerfile
deleted file mode 100644
index 4daa91f..0000000
--- a/tox-maven/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-ARG REGISTRY=swh-jenkins
-FROM $REGISTRY/base-buster
-LABEL maintainer="SoftwareHeritage"
-
-USER jenkins
-
-RUN python3 -m pip install --user --upgrade \
-  pip setuptools wheel twine tox detox
-RUN python3 -m pip install --user --no-warn-script-location \
-  Radon pylint coverage codespell pyarcanist
diff --git a/tox/Dockerfile b/tox/Dockerfile
index b52ce1c..4daa91f 100644
--- a/tox/Dockerfile
+++ b/tox/Dockerfile
@@ -1,11 +1,10 @@
 ARG REGISTRY=swh-jenkins
-FROM $REGISTRY/base
+FROM $REGISTRY/base-buster
 LABEL maintainer="SoftwareHeritage"
-USER root
 
 USER jenkins
 
 RUN python3 -m pip install --user --upgrade \
   pip setuptools wheel twine tox detox
 RUN python3 -m pip install --user --no-warn-script-location \
   Radon pylint coverage codespell pyarcanist