diff --git a/base/Dockerfile b/base/Dockerfile
index f8e513a..c732749 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,18 +1,28 @@
 FROM jenkins/jnlp-slave
 LABEL maintainer="SoftwareHeritage"
 USER root
 
 # some base packages
 RUN apt-get update && \
   apt-get upgrade -y && \
   apt-get install -y \
     build-essential \
     curl \
     python3-dev \
     python3-pip \
     python3-venv libsvn-dev \
     libsystemd-dev \
-    pkg-config && \
-  rm -rf /var/lib/apt/lists/*
+    pkg-config
+
+# install postgresql 10
+RUN echo deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main > /etc/apt/sources.list.d/postgres.list
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN apt-get update && \
+    apt-get install -y \
+	  postgresql-10 \
+	  postgresql-client-10 \
+	  libpq-dev \
+	  arcanist && \
+	rm -rf /var/lib/apt/lists/*
 
 USER jenkins
diff --git a/tox/Dockerfile b/tox/Dockerfile
index 6f4ca30..4bc0732 100644
--- a/tox/Dockerfile
+++ b/tox/Dockerfile
@@ -1,22 +1,11 @@
 ARG REGISTRY=swh-jenkins
 FROM $REGISTRY/base
 LABEL maintainer="SoftwareHeritage"
 USER root
 
-# install postgresql 10
-RUN echo deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main > /etc/apt/sources.list.d/postgres.list
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN apt-get update && \
-    apt-get install -y \
-	  postgresql-10 \
-	  postgresql-client-10 \
-	  libpq-dev \
-	  arcanist && \
-	rm -rf /var/lib/apt/lists/*
-
 USER jenkins
 
 RUN python3 -m pip install --user --upgrade \
   pip setuptools tox wheel
 RUN python3 -m pip install --user --no-warn-script-location \
   Radon pylint coverage codespell