diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index 9905a57..82bacd5 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -96,11 +96,9 @@ services:
     build:
       args:
         # https://github.com/sorintlab/stolon/releases
-        STOLON_VERSION: 2d0b8e516a4eaec01f3a9509cdc50a1d4ce8709c
-        # https://packages.debian.org/fr/stretch/postgresql-all
-        PG_VERSION: 9.6+181+deb9u3
+        STOLON_VERSION: 057389f7e484ee1d5c1e1a7020256020e7413c87
       context: ./postgres/build/postgres
-    image: superboum/amd64_postgres:v5
+    image: superboum/amd64_postgres:v6
 
   backup-consul:
     build:
diff --git a/app/postgres/build/postgres/Dockerfile b/app/postgres/build/postgres/Dockerfile
index 4a9e280..71b24b5 100644
--- a/app/postgres/build/postgres/Dockerfile
+++ b/app/postgres/build/postgres/Dockerfile
@@ -9,10 +9,6 @@ COPY 0001-Add-max-rate-to-pg_basebackup.patch .
 RUN git apply 0001-Add-max-rate-to-pg_basebackup.patch
 RUN make && chmod +x /stolon/bin/*
 
-FROM amd64/debian:stretch
-ARG PG_VERSION
-RUN apt-get update && \
-    apt-get install -y postgresql-all=${PG_VERSION}
+FROM postgres:13.3-alpine
 COPY --from=builder /stolon/bin /usr/local/bin
-USER postgres