diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 7ed793f..6980964 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -1,43 +1,47 @@
-ARG debianversion=stretch
-FROM debian:${debianversion:-stretch}
+ARG debianversion=buster
+FROM debian:${debianversion:-buster}
 LABEL maintainer="Software Heritage <sysop@softwareheritage.org>"
 ENV PROJECT_NAME swh-base
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && apt-get upgrade -y && \
   apt-get install -y \
     apt-transport-https curl lsb-release
 
 RUN echo deb http://deb.debian.org/debian/ $(lsb_release -sc)-backports main \
          > /etc/apt/sources.list.d/backports.list
 
 RUN echo deb [trusted=yes] https://debian.softwareheritage.org/ $(lsb_release -sc)-swh main  \
          > /etc/apt/sources.list.d/softwareheritage.list
 
 RUN mkdir /etc/softwareheritage
 RUN mkdir -p /var/run/gunicorn/swh
 RUN mkdir -p /srv/softwareheritage/objects
 
 ENV SWH_CONFIG_FILENAME=/etc/softwareheritage/config.yml
 ENV LC_ALL=C.UTF-8
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     -t $(lsb_release -sc)-backports \
 	postgresql-client \
 	gunicorn3 \
+	python3-dulwich \
     python3-swh.objstorage \
     python3-swh.scheduler \
     python3-swh.storage \
     python3-swh.journal \
+	wait-for-it \
 	&& \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
 
 COPY conf/logconfig.ini /etc/gunicorn/logconfig.ini
 COPY conf/gunicorn.cfg /etc/gunicorn/swh.cfg
+COPY tools/*.sh /srv/softwareheritage/utils/
+RUN chmod +x /srv/softwareheritage/utils/*.sh
 
 COPY base/entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/images/tools/pgsql.sh b/images/tools/pgsql.sh
new file mode 100755
index 0000000..a453bf5
--- /dev/null
+++ b/images/tools/pgsql.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+setup_pgsql () {
+    echo "${PGHOST}:5432:${PGDATABASE:-swh}:${PGUSER:-swh}:$(cat /run/secrets/postgres-password)" \
+		 > ~/.pgpass
+    cat > ~/.pg_service.conf <<EOF
+[swh]
+dbname=${PGDATABASE:-swh}
+host=${PGHOST}
+port=5432
+user=${PGUSER:-swh}
+EOF
+    chmod 0600 ~/.pgpass
+}
+
+wait_pgsql () {
+    echo Waiting for postgresql to start
+    wait-for-it ${PGHOST}:5432 -s --timeout=0
+    until psql postgresql:///?service=swh -c "select 1" > /dev/null 2> /dev/null; do sleep 1; done
+}
diff --git a/images/web/Dockerfile b/images/web/Dockerfile
index 198d8fc..8e4290a 100644
--- a/images/web/Dockerfile
+++ b/images/web/Dockerfile
@@ -1,40 +1,40 @@
-ARG debianversion=stretch
-FROM debian:${debianversion:-stretch}
+ARG debianversion=buster
+FROM debian:${debianversion:-buster}
 LABEL maintainer="Software Heritage <sysop@softwareheritage.org>"
 ENV PROJECT_NAME swh-web
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && apt-get upgrade -y && \
   apt-get install -y \
     apt-transport-https curl lsb-release
 
 RUN echo deb http://deb.debian.org/debian/ $(lsb_release -sc)-backports main \
          > /etc/apt/sources.list.d/backports.list
 
 RUN echo deb [trusted=yes] https://debian.softwareheritage.org/ $(lsb_release -sc)-swh main  \
          > /etc/apt/sources.list.d/softwareheritage.list
 
 RUN mkdir /etc/softwareheritage
 RUN mkdir -p /var/run/gunicorn/swh
 RUN mkdir -p /var/lib/swh
 
 ENV SWH_CONFIG_FILENAME=/etc/softwareheritage/config.yml
 ENV LC_ALL=C.UTF-8
 ENV DJANGO_SETTINGS_MODULE=swh.web.settings.production
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     -t $(lsb_release -sc)-backports \
 	gunicorn3 \
 	python3-magic \
     python3-swh.web \
 	&& \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
 COPY conf/logconfig.ini /etc/gunicorn/logconfig.ini
 COPY conf/gunicorn.cfg /etc/gunicorn/swh.cfg
 
 COPY web/entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]