diff --git a/dockerfiles/swh-indexer-storage/Dockerfile b/dockerfiles/swh-indexer-storage/Dockerfile
index 026ed88..2c83afe 100644
--- a/dockerfiles/swh-indexer-storage/Dockerfile
+++ b/dockerfiles/swh-indexer-storage/Dockerfile
@@ -1,14 +1,16 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client
 
+RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-indexer
+
 COPY indexer_storage.yml /
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 5002
diff --git a/dockerfiles/swh-indexer-worker/Dockerfile b/dockerfiles/swh-indexer-worker/Dockerfile
index 77a07b3..aa939e2 100644
--- a/dockerfiles/swh-indexer-worker/Dockerfile
+++ b/dockerfiles/swh-indexer-worker/Dockerfile
@@ -1,16 +1,17 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client
 
-RUN pip install --upgrade pip
+RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-indexer
-RUN useradd -ms /bin/bash swh
 
+RUN useradd -ms /bin/bash swh
 USER swh
+
 COPY entrypoint.sh /
 COPY indexer.yml /home/swh/
 
 ENTRYPOINT ["/home/swh/entrypoint.sh"]
diff --git a/dockerfiles/swh-listers-worker/Dockerfile b/dockerfiles/swh-listers-worker/Dockerfile
index 06d04f7..e14dc72 100644
--- a/dockerfiles/swh-listers-worker/Dockerfile
+++ b/dockerfiles/swh-listers-worker/Dockerfile
@@ -1,16 +1,18 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client
 
+RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-lister
+
 RUN useradd -ms /bin/bash swh
-COPY entrypoint.sh /
 
+COPY entrypoint.sh /
 COPY lister.yml /home/swh/.config/swh/
 RUN chown -R swh: /home/swh/.config/
 
 USER swh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-objstorage/Dockerfile b/dockerfiles/swh-objstorage/Dockerfile
index 3fc22e4..f4228f6 100644
--- a/dockerfiles/swh-objstorage/Dockerfile
+++ b/dockerfiles/swh-objstorage/Dockerfile
@@ -1,16 +1,18 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev
 
+RUN pip install -U pip setuptools wheel
 RUN pip install swh-objstorage
-COPY objstorage.yml /
+
 COPY entrypoint.sh /
+COPY objstorage.yml /
 
 RUN mkdir -p /srv/softwareheritage/objects
 
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 5003
diff --git a/dockerfiles/swh-scheduler-api/Dockerfile b/dockerfiles/swh-scheduler-api/Dockerfile
index d11e35e..fac9857 100644
--- a/dockerfiles/swh-scheduler-api/Dockerfile
+++ b/dockerfiles/swh-scheduler-api/Dockerfile
@@ -1,15 +1,16 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client
-RUN pip install --upgrade pip setuptools wheel
 
+RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-scheduler
+
 COPY scheduler.yml /
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 5008
diff --git a/dockerfiles/swh-scheduler-worker/Dockerfile b/dockerfiles/swh-scheduler-worker/Dockerfile
index c964c6c..0fd3e90 100644
--- a/dockerfiles/swh-scheduler-worker/Dockerfile
+++ b/dockerfiles/swh-scheduler-worker/Dockerfile
@@ -1,16 +1,17 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client libpq-dev
 
+RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-scheduler --no-binary psycopg2
 RUN mkdir -p /etc/softwareheritage/worker/
 COPY scheduler.yml /etc/softwareheritage/
 # XXX this should NOT be needed.
 # Some cleanup work in config files handling seems necessary...
 RUN ln -s /etc/softwareheritage/scheduler.yml /etc/softwareheritage/worker/
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-storage/Dockerfile b/dockerfiles/swh-storage/Dockerfile
index f4d4878..94e8e09 100644
--- a/dockerfiles/swh-storage/Dockerfile
+++ b/dockerfiles/swh-storage/Dockerfile
@@ -1,14 +1,16 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client
 
+RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-storage
+
 COPY storage.yml /
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 5002