diff --git a/base-jdk11/Dockerfile b/base-buster/Dockerfile
similarity index 100%
rename from base-jdk11/Dockerfile
rename to base-buster/Dockerfile
diff --git a/base-jdk11/jenkins-agent b/base-buster/jenkins-agent
similarity index 100%
rename from base-jdk11/jenkins-agent
rename to base-buster/jenkins-agent
diff --git a/sphinx/Dockerfile b/sphinx/Dockerfile
index fc56b36..06ecfd3 100644
--- a/sphinx/Dockerfile
+++ b/sphinx/Dockerfile
@@ -1,21 +1,21 @@
 ARG REGISTRY=swh-jenkins
-FROM $REGISTRY/base-jdk11
+FROM $REGISTRY/base-buster
 
 USER root
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
   apt-get install -y --no-install-recommends \
     crudini \
     dia \
     graphviz \
     inkscape \
     libffi-dev \
     maven \
     make \
     myrepos \
     plantuml \
     postgresql-autodoc \
     rsync \
     tox \
   && rm -rf /var/lib/apt/lists/*
 
 USER jenkins
diff --git a/tox-maven/Dockerfile b/tox-maven/Dockerfile
index 89c10fa..4daa91f 100644
--- a/tox-maven/Dockerfile
+++ b/tox-maven/Dockerfile
@@ -1,10 +1,10 @@
 ARG REGISTRY=swh-jenkins
-FROM $REGISTRY/base-jdk11
+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