diff --git a/docker-compose.yml b/docker-compose.yml
index 01f2a3e..9894d53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,11 @@
 version: '3'
 services:
   pgsql:
-    image: gnuviech/pgsql:stretch
+    image: gnuviech/pgsql:buster
     build: pgsql
   redis:
-    image: gnuviech/redis:stretch
+    image: gnuviech/redis:buster
     build: redis
   mq:
-    image: gnuviech/mq:stretch
+    image: gnuviech/mq:buster
     build: mq
diff --git a/mq/Dockerfile b/mq/Dockerfile
index aa7c227..d0c73b0 100644
--- a/mq/Dockerfile
+++ b/mq/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:buster
 LABEL maintainer "Jan Dittberner <jan@dittberner.info>"
 
 RUN apt-get update \
diff --git a/pgsql/Dockerfile b/pgsql/Dockerfile
index 854d190..a9d07a7 100644
--- a/pgsql/Dockerfile
+++ b/pgsql/Dockerfile
@@ -13,7 +13,7 @@ EXPOSE 5432
 VOLUME /var/lib/postgresql/
 COPY pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
 COPY startup.sh /srv/
-HEALTHCHECK CMD pg_isready -d postgres
+HEALTHCHECK CMD su postgres -c 'pg_isready -d postgres'
 
 ENTRYPOINT ["dumb-init"]
 CMD "/srv/startup.sh"
diff --git a/redis/Dockerfile b/redis/Dockerfile
index a1b20c9..834c487 100644
--- a/redis/Dockerfile
+++ b/redis/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:buster
 LABEL maintainer "Jan Dittberner <jan@dittberner.info>"
 
 RUN apt-get update \