diff --git a/dockerfiles/swh-indexer-journal-client/Dockerfile b/dockerfiles/swh-indexer-journal-client/Dockerfile
index f3f2ab7..a01a84b 100644
--- a/dockerfiles/swh-indexer-journal-client/Dockerfile
+++ b/dockerfiles/swh-indexer-journal-client/Dockerfile
@@ -1,10 +1,11 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install -y libsystemd-dev
+  apt-get install -y libsystemd-dev && \
+  apt-get install -y wait-for-it
 
 RUN pip install swh-indexer
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-indexer-journal-client/entrypoint.sh b/dockerfiles/swh-indexer-journal-client/entrypoint.sh
index 51f2908..17cf7bf 100755
--- a/dockerfiles/swh-indexer-journal-client/entrypoint.sh
+++ b/dockerfiles/swh-indexer-journal-client/entrypoint.sh
@@ -1,25 +1,25 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
       pushd $srcrepo
       pip install -e .
       popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
-      echo "Starting swh-journal client"
-      python3 -m swh.indexer.journal_client
+      echo "Starting swh-indexer-journal client"
+      exec wait-for-it kafka:9092 -s --timeout=0 -- python3 -m swh.indexer.journal_client
       ;;
 esac
 
diff --git a/dockerfiles/swh-journal-client/Dockerfile b/dockerfiles/swh-journal-client/Dockerfile
index d108098..0854970 100644
--- a/dockerfiles/swh-journal-client/Dockerfile
+++ b/dockerfiles/swh-journal-client/Dockerfile
@@ -1,11 +1,12 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install -y libsystemd-dev
+  apt-get install -y libsystemd-dev && \
+  apt-get install -y wait-for-it
 
 RUN pip install swh-journal
 COPY client.py /
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-journal-client/entrypoint.sh b/dockerfiles/swh-journal-client/entrypoint.sh
index ec37f81..c75bb40 100755
--- a/dockerfiles/swh-journal-client/entrypoint.sh
+++ b/dockerfiles/swh-journal-client/entrypoint.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
       pushd $srcrepo
       pip install -e .
       popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       echo "Starting an swh-journal client"
-      exec python3 -m client
+      exec wait-for-it kafka:9092 -s --timeout=0 -- python3 -m client
       ;;
 esac
diff --git a/dockerfiles/swh-journal-publisher/Dockerfile b/dockerfiles/swh-journal-publisher/Dockerfile
index a8786d5..f7a05da 100644
--- a/dockerfiles/swh-journal-publisher/Dockerfile
+++ b/dockerfiles/swh-journal-publisher/Dockerfile
@@ -1,10 +1,11 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install -y libsystemd-dev
+  apt-get install -y libsystemd-dev && \
+  apt-get install -y wait-for-it
 
 RUN pip install swh-journal
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-journal-publisher/entrypoint.sh b/dockerfiles/swh-journal-publisher/entrypoint.sh
index b994c4b..db1f527 100755
--- a/dockerfiles/swh-journal-publisher/entrypoint.sh
+++ b/dockerfiles/swh-journal-publisher/entrypoint.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
       pushd $srcrepo
       pip install -e .
       popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
-        echo "Starting swh-journal publisher"
-        exec python3 -m swh.journal.publisher
+        echo "Starting swh-journal-publisher"
+        exec wait-for-it kafka:9092 -s --timeout=0 -- python3 -m swh.journal.publisher
       ;;
 esac
diff --git a/dockerfiles/swh-storage-listener/Dockerfile b/dockerfiles/swh-storage-listener/Dockerfile
index 9fa4d90..3e9c069 100644
--- a/dockerfiles/swh-storage-listener/Dockerfile
+++ b/dockerfiles/swh-storage-listener/Dockerfile
@@ -1,11 +1,12 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install -y \
-    libsystemd-dev postgresql-client
+  apt-get install -y libsystemd-dev && \
+  apt-get install -y postgresql-client && \
+  apt-get install -y wait-for-it
 
 RUN pip install swh-storage kafka_python
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-storage-listener/entrypoint.sh b/dockerfiles/swh-storage-listener/entrypoint.sh
index 94ccfb9..38b2a2d 100755
--- a/dockerfiles/swh-storage-listener/entrypoint.sh
+++ b/dockerfiles/swh-storage-listener/entrypoint.sh
@@ -1,38 +1,38 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
       pushd $srcrepo
       pip install -e .
       popd
     done
 fi
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 echo Installed Python packages:
 pip list
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       echo "Waiting for postgresql to start"
-      until psql postgresql:///?service=swh -c "select 1" 1>&2 >/dev/null; do sleep 0.1; done
+      wait-for-it swh-storage-db:5432 -s --timeout=0
 
-      echo "Starting swh-storage's listener"
-      exec python3 -m swh.storage.listener
+      echo "Starting swh-storage-listener"
+      exec wait-for-it kafka:9092 -s --timeout=0 -- python3 -m swh.storage.listener
       ;;
 esac