diff --git a/dockerfiles/swh-indexer-worker/indexer.yml b/dockerfiles/swh-indexer-worker/indexer.yml
index 22303d4..cd1aca8 100644
--- a/dockerfiles/swh-indexer-worker/indexer.yml
+++ b/dockerfiles/swh-indexer-worker/indexer.yml
@@ -1,16 +1,18 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
 objstorage:
   cls: remote
   args:
     url: http://swh-objstorage:5003/
 indexer_storage:
   cls: remote
   args:
     url: http://swh-idx-storage:5007/
 scheduler:
   cls: remote
   args:
     url: http://swh-scheduler-api:5008/
+celery:
+  task_broker: amqp://guest:guest@amqp//
diff --git a/dockerfiles/swh-listers-worker/lister.yml b/dockerfiles/swh-listers-worker/lister.yml
index e4d8619..94ffe23 100644
--- a/dockerfiles/swh-listers-worker/lister.yml
+++ b/dockerfiles/swh-listers-worker/lister.yml
@@ -1,9 +1,14 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
+
 scheduler:
   cls: remote
   args:
     url: http://swh-scheduler-api:5008/
+
+celery:
+  task_broker: amqp://guest:guest@amqp//
+
 lister_db_url: postgresql:///?service=swh
diff --git a/dockerfiles/swh-loaders-worker/loader.yml b/dockerfiles/swh-loaders-worker/loader.yml
index 1cd88c8..76499ad 100644
--- a/dockerfiles/swh-loaders-worker/loader.yml
+++ b/dockerfiles/swh-loaders-worker/loader.yml
@@ -1,5 +1,7 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
 lister_db_url: postgresql:///?service=swh
+celery:
+  task_broker: amqp://guest:guest@amqp//
diff --git a/dockerfiles/swh-scheduler-worker/scheduler.yml b/dockerfiles/swh-scheduler-worker/scheduler.yml
index e550d27..af1b3f5 100644
--- a/dockerfiles/swh-scheduler-worker/scheduler.yml
+++ b/dockerfiles/swh-scheduler-worker/scheduler.yml
@@ -1,7 +1,8 @@
 scheduler:
   cls: local
   args:
     db: postgresql:///?service=swh-scheduler
-task_broker: amqp://guest:guest@amqp//
-broker_transport_options:
-  max_retries: 1
+celery:
+  task_broker: amqp://guest:guest@amqp//
+  broker_transport_options:
+    max_retries: 1