diff --git a/docker/Dockerfile b/docker/Dockerfile
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,8 @@
 FROM python:3.7
 
+RUN . /etc/os-release && echo "deb http://apt.postgresql.org/pub/repos/apt ${VERSION_CODENAME}-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+  wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && apt-get upgrade -y && \
   apt-get install -y \
@@ -9,7 +12,7 @@
     libsvn-dev \
     libsystemd-dev \
     memcached \
-    postgresql-client \
+    postgresql-client-12 \
     wait-for-it \
     ngrep \
     rsync && \
diff --git a/docker/docker-compose.storage-mirror.yml b/docker/docker-compose.storage-mirror.yml
--- a/docker/docker-compose.storage-mirror.yml
+++ b/docker/docker-compose.storage-mirror.yml
@@ -10,7 +10,7 @@
 
   # create a dedicated db for the mirror
   swh-storage-mirror-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/storage-db-mirror.env
     environment:
diff --git a/docker/docker-compose.storage-read-replica.yml b/docker/docker-compose.storage-read-replica.yml
--- a/docker/docker-compose.storage-read-replica.yml
+++ b/docker/docker-compose.storage-read-replica.yml
@@ -2,7 +2,7 @@
 
 services:
   swh-storage-read-replica-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/storage-read-replica-db.env
     environment:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -90,7 +90,7 @@
 # Scheduler
 
   swh-scheduler-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/common_python.env
       - ./env/scheduler-db.env
@@ -161,7 +161,7 @@
 # Graph storage
 
   swh-storage-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/storage-db.env
     environment:
@@ -210,7 +210,7 @@
 # Indexer storage
 
   swh-idx-storage-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/indexers-db.env
     environment:
@@ -259,7 +259,7 @@
       - "./services/swh-web/entrypoint.sh:/entrypoint.sh:ro"
 
   swh-deposit-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/deposit-db.env
     environment:
@@ -287,7 +287,7 @@
       - "./services/swh-deposit/entrypoint.sh:/entrypoint.sh:ro"
 
   swh-vault-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/vault-db.env
     environment:
@@ -338,7 +338,7 @@
 # Lister Celery workers
 
   swh-listers-db:
-    image: postgres:11
+    image: postgres:12
     env_file:
       - ./env/listers-db.env
     environment: