diff --git a/docker/Dockerfile b/docker/Dockerfile
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,16 +26,6 @@
 RUN pip install --upgrade pip setuptools wheel
 RUN pip install gunicorn httpie
 
-ARG CASS_DRIVER_NO_CYTHON
-ENV CASS_DRIVER_NO_CYTHON ${CASS_DRIVER_NO_CYTHON}
-ARG CASS_DRIVER_BUILD_CONCURRENCY
-ENV CASS_DRIVER_BUILD_CONCURRENCY ${CASS_DRIVER_BUILD_CONCURRENCY:-1}
-RUN pip install cassandra-driver
-
-# Enforce installation of django 1 otherwise pip will choose django 2 when
-# installing the swh stack due to poor version dependency support in pip
-RUN pip install 'Django<2'
-
 RUN pip install \
         swh-core[db,http] \
         swh-deposit[server] \
diff --git a/docker/services/swh-listers-worker/entrypoint.sh b/docker/services/swh-listers-worker/entrypoint.sh
--- a/docker/services/swh-listers-worker/entrypoint.sh
+++ b/docker/services/swh-listers-worker/entrypoint.sh
@@ -27,6 +27,7 @@
         swh lister -C ${SWH_CONFIG_FILENAME} db-init
 
         echo Register task types in scheduler database
+        wait-for-it swh-scheduler:5008 -s --timeout=0
         swh scheduler -C ${SWH_CONFIG_FILENAME} task-type register
 
         echo Waiting for RabbitMQ to start
diff --git a/docker/services/swh-scheduler-worker/entrypoint.sh b/docker/services/swh-scheduler-worker/entrypoint.sh
--- a/docker/services/swh-scheduler-worker/entrypoint.sh
+++ b/docker/services/swh-scheduler-worker/entrypoint.sh
@@ -15,6 +15,8 @@
     *)
         wait_pgsql
 
+        wait-for-it swh-scheduler:5008 -s --timeout=0
+
         echo "Starting the swh-scheduler $1"
         exec wait-for-it amqp:5672 -s --timeout=0 -- swh --log-level ${LOGLEVEL} scheduler -C /scheduler.yml $@
         ;;
diff --git a/docker/services/swh-worker/entrypoint.sh b/docker/services/swh-worker/entrypoint.sh
--- a/docker/services/swh-worker/entrypoint.sh
+++ b/docker/services/swh-worker/entrypoint.sh
@@ -14,6 +14,7 @@
         wait-for-it amqp:5672 -s --timeout=0
 
         echo Register task types in scheduler database
+        wait-for-it swh-scheduler:5008 -s --timeout=0
         swh scheduler -C ${SWH_CONFIG_FILENAME} task-type register
 
         echo Starting the swh Celery worker for ${SWH_WORKER_INSTANCE}
diff --git a/docker/tests/test_01_loader_git.sh b/docker/tests/test_01_loader_git.sh
--- a/docker/tests/test_01_loader_git.sh
+++ b/docker/tests/test_01_loader_git.sh
@@ -10,7 +10,7 @@
 
 status_message "Waiting for the git loading task to complete"
 
-wait_for_service_output 300 swh-loader "swh.loader.git.tasks.UpdateGitRepository.*succeeded"
+wait_for_service_output 300 swh-loader "swh.loader.git.tasks.UpdateGitRepository.*succeeded\|Traceback"
 
 status_message "The loading task has been successfully executed"