diff --git a/dockerfiles/swh-indexer-worker/Dockerfile b/dockerfiles/swh-indexer-worker/Dockerfile
index 285d524..48bbd65 100644
--- a/dockerfiles/swh-indexer-worker/Dockerfile
+++ b/dockerfiles/swh-indexer-worker/Dockerfile
@@ -1,16 +1,17 @@
 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 --upgrade pip setuptools wheel
 RUN pip install swh-indexer
 
 RUN useradd -ms /bin/bash swh
 USER swh
 
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-indexer-worker/entrypoint.sh b/dockerfiles/swh-indexer-worker/entrypoint.sh
index 32c1dc4..3e557b6 100755
--- a/dockerfiles/swh-indexer-worker/entrypoint.sh
+++ b/dockerfiles/swh-indexer-worker/entrypoint.sh
@@ -1,32 +1,35 @@
 #!/bin/bash
 
 set -e
 export PATH=${HOME}/.local/bin:${PATH}
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo will NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
+        echo Waiting for RabbitMQ to start
+        wait-for-it amqp:5672 -s --timeout=0
+
         echo Starting swh-indexer worker
         exec python -m celery worker \
              --app=swh.scheduler.celery_backend.config.app \
              --pool=prefork --events \
              --concurrency=${CONCURRENCY} \
              --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
              -Ofair --loglevel=${LOGLEVEL} --without-gossip \
              --without-mingle \
-			 --heartbeat-interval 10 \
+			       --heartbeat-interval 10 \
              --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;
 esac
diff --git a/dockerfiles/swh-listers-worker/Dockerfile b/dockerfiles/swh-listers-worker/Dockerfile
index 6b62b5c..3f284a1 100644
--- a/dockerfiles/swh-listers-worker/Dockerfile
+++ b/dockerfiles/swh-listers-worker/Dockerfile
@@ -1,16 +1,17 @@
 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 --upgrade pip setuptools wheel
 RUN pip install swh-lister
 
 RUN useradd -ms /bin/bash swh
 
 COPY entrypoint.sh /
 
 USER swh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-listers-worker/entrypoint.sh b/dockerfiles/swh-listers-worker/entrypoint.sh
index ab0698d..7faf612 100755
--- a/dockerfiles/swh-listers-worker/entrypoint.sh
+++ b/dockerfiles/swh-listers-worker/entrypoint.sh
@@ -1,64 +1,67 @@
 #!/bin/bash
 
 set -e
 export PATH=${HOME}/.local/bin:${PATH}
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo wil NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 export POSTGRES_DB=swh-lister-${SWH_WORKER_INSTANCE}
 
 echo "${PGHOST}:5432:postgres:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 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
 
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
         echo Setup ${POSTGRES_DB} database for ${SWH_WORKER_INSTANCE}
 
         if psql -lqt | cut -d \| -f 1 | grep -qw ${POSTGRES_DB}; then
             echo Database already exists, nothing to do
         else
             echo Creating database
             createdb ${POSTGRES_DB}
 
-			echo Initialize database
-			python -m swh.lister.cli \
-				   --db-url postgres://${PGUSER}@${PGHOST}/${POSTGRES_DB} \
-				   all
-		fi
+            echo Initialize database
+            python -m swh.lister.cli \
+                   --db-url postgres://${PGUSER}@${PGHOST}/${POSTGRES_DB} \
+                   all
+        fi
+
+        echo Waiting for RabbitMQ to start
+        wait-for-it amqp:5672 -s --timeout=0
 
         echo Starting the swh-lister Celery worker for ${SWH_WORKER_INSTANCE}
         exec python -m celery worker \
                     --app=swh.scheduler.celery_backend.config.app \
                     --pool=prefork --events \
                     --concurrency=${CONCURRENCY} \
                     --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
                     -Ofair --loglevel=${LOGLEVEL} --without-gossip \
                     --without-mingle \
-					--heartbeat-interval 10 \
+                    --heartbeat-interval 10 \
                     --hostname "${SWH_WORKER_INSTANCE}@%h"
         ;;
 esac
diff --git a/dockerfiles/swh-loaders-worker/Dockerfile b/dockerfiles/swh-loaders-worker/Dockerfile
index 3f90604..4d77e5b 100644
--- a/dockerfiles/swh-loaders-worker/Dockerfile
+++ b/dockerfiles/swh-loaders-worker/Dockerfile
@@ -1,22 +1,24 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install -y \
-    libsystemd-dev libapr1-dev libaprutil1-dev libsvn-dev
+  apt-get install -y libsystemd-dev && \
+  apt-get install -y libapr1-dev libaprutil1-dev && \
+  apt-get install -y libsvn-dev && \
+  apt-get install -y wait-for-it
 
 RUN pip install \
         swh-loader-debian \
         swh-loader-dir \
         swh-loader-git \
         swh-loader-mercurial \
         swh-loader-pypi \
         swh-loader-svn \
         swh-loader-tar
 
 
 RUN useradd -ms /bin/bash swh
 COPY entrypoint.sh /
 
 USER swh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-loaders-worker/entrypoint.sh b/dockerfiles/swh-loaders-worker/entrypoint.sh
index a5a5d9f..d135d21 100755
--- a/dockerfiles/swh-loaders-worker/entrypoint.sh
+++ b/dockerfiles/swh-loaders-worker/entrypoint.sh
@@ -1,36 +1,39 @@
 #!/bin/bash
 
 set -e
 export PATH=${HOME}/.local/bin:${PATH}
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo will NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
+        echo Waiting for RabbitMQ to start
+        wait-for-it amqp:5672 -s --timeout=0
+
         echo Starting the swh-loader Celery worker for ${SWH_WORKER_INSTANCE}
         exec python -m celery worker \
                     --app=swh.scheduler.celery_backend.config.app \
                     --pool=prefork --events \
                     --concurrency=${CONCURRENCY} \
                     --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
                     -Ofair --loglevel=${LOGLEVEL} --without-gossip \
                     --without-mingle \
-					--heartbeat-interval 10 \
+					          --heartbeat-interval 10 \
                     --hostname "${SWH_WORKER_INSTANCE}@%h"
         ;;
 esac
diff --git a/dockerfiles/swh-scheduler-worker/Dockerfile b/dockerfiles/swh-scheduler-worker/Dockerfile
index 17385f2..ba8fd3c 100644
--- a/dockerfiles/swh-scheduler-worker/Dockerfile
+++ b/dockerfiles/swh-scheduler-worker/Dockerfile
@@ -1,13 +1,14 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install -y \
-    libsystemd-dev postgresql-client libpq-dev
+  apt-get install -y libsystemd-dev && \
+  apt-get install -y postgresql-client libpq-dev && \
+  apt-get install -y wait-for-it
 
 RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-scheduler --no-binary psycopg2
 
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-scheduler-worker/entrypoint.sh b/dockerfiles/swh-scheduler-worker/entrypoint.sh
index fca3001..6f25e8e 100755
--- a/dockerfiles/swh-scheduler-worker/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-worker/entrypoint.sh
@@ -1,35 +1,35 @@
 #!/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
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-scheduler]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
-		echo Starting the swh-scheduler $1
-		exec swh-scheduler --log-level ${LOGLEVEL} -C /scheduler.yml $@
-        ;;
+		  echo "Starting the swh-scheduler $1"
+		  exec wait-for-it amqp:5672 -s --timeout=0 -- swh-scheduler --log-level ${LOGLEVEL} -C /scheduler.yml $@
+      ;;
 esac