diff --git a/dockerfiles/swh-indexer-journal-client/Dockerfile b/dockerfiles/swh-indexer-journal-client/Dockerfile
--- a/dockerfiles/swh-indexer-journal-client/Dockerfile
+++ b/dockerfiles/swh-indexer-journal-client/Dockerfile
@@ -2,7 +2,8 @@
 
 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 /
diff --git a/dockerfiles/swh-indexer-journal-client/entrypoint.sh b/dockerfiles/swh-indexer-journal-client/entrypoint.sh
--- a/dockerfiles/swh-indexer-journal-client/entrypoint.sh
+++ b/dockerfiles/swh-indexer-journal-client/entrypoint.sh
@@ -18,8 +18,8 @@
       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
--- a/dockerfiles/swh-journal-client/Dockerfile
+++ b/dockerfiles/swh-journal-client/Dockerfile
@@ -2,7 +2,8 @@
 
 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 /
diff --git a/dockerfiles/swh-journal-client/entrypoint.sh b/dockerfiles/swh-journal-client/entrypoint.sh
--- a/dockerfiles/swh-journal-client/entrypoint.sh
+++ b/dockerfiles/swh-journal-client/entrypoint.sh
@@ -19,6 +19,6 @@
       ;;
     *)
       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
--- a/dockerfiles/swh-journal-publisher/Dockerfile
+++ b/dockerfiles/swh-journal-publisher/Dockerfile
@@ -2,7 +2,8 @@
 
 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 /
diff --git a/dockerfiles/swh-journal-publisher/entrypoint.sh b/dockerfiles/swh-journal-publisher/entrypoint.sh
--- a/dockerfiles/swh-journal-publisher/entrypoint.sh
+++ b/dockerfiles/swh-journal-publisher/entrypoint.sh
@@ -18,7 +18,7 @@
       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
--- a/dockerfiles/swh-storage-listener/Dockerfile
+++ b/dockerfiles/swh-storage-listener/Dockerfile
@@ -2,8 +2,9 @@
 
 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 /
diff --git a/dockerfiles/swh-storage-listener/entrypoint.sh b/dockerfiles/swh-storage-listener/entrypoint.sh
--- a/dockerfiles/swh-storage-listener/entrypoint.sh
+++ b/dockerfiles/swh-storage-listener/entrypoint.sh
@@ -30,9 +30,9 @@
       ;;
     *)
       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