diff --git a/conf/indexer.yml b/conf/indexer.yml
index dbebd35..dd2133b 100644
--- a/conf/indexer.yml
+++ b/conf/indexer.yml
@@ -1,20 +1,31 @@
 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//
   task_modules:
     - swh.indexer.tasks
+  task_queues:
+    - swh.indexer.tasks.ContentFossologyLicense
+    - swh.indexer.tasks.ContentLanguage
+    - swh.indexer.tasks.ContentMimetype
+    - swh.indexer.tasks.ContentRangeFossologyLicense
+    - swh.indexer.tasks.ContentRangeMimetype
+    - swh.indexer.tasks.Ctags
+    - swh.indexer.tasks.OriginHead
+    - swh.indexer.tasks.OriginMetadata
+    - swh.indexer.tasks.RecomputeChecksums
+    - swh.indexer.tasks.RevisionMetadata
diff --git a/conf/lister.yml b/conf/lister.yml
index 887cc2b..32fd0c6 100644
--- a/conf/lister.yml
+++ b/conf/lister.yml
@@ -1,26 +1,44 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
 
 scheduler:
   cls: remote
   args:
     url: http://swh-scheduler-api:5008/
 
 lister:
   cls: local
   args:
     db: postgresql:///?service=swh
 
 celery:
   task_broker: amqp://guest:guest@amqp//
   task_modules:
     - swh.lister.bitbucket.tasks
     - swh.lister.debian.tasks
     - swh.lister.github.tasks
     - swh.lister.gitlab.tasks
     - swh.lister.npm.tasks
     - swh.lister.pypi.tasks
-
-lister_db_url: postgresql:///?service=swh
+  task_queues:
+    - swh.lister.bitbucket.tasks.FullBitBucketRelister
+    - swh.lister.bitbucket.tasks.IncrementalBitBucketLister
+    - swh.lister.bitbucket.tasks.RangeBitBucketLister
+    - swh.lister.bitbucket.tasks.ping
+    - swh.lister.debian.tasks.DebianListerTask
+    - swh.lister.debian.tasks.ping
+    - swh.lister.github.tasks.FullGitHubRelister
+    - swh.lister.github.tasks.IncrementalGitHubLister
+    - swh.lister.github.tasks.RangeGitHubLister
+    - swh.lister.github.tasks.ping
+    - swh.lister.gitlab.tasks.FullGitLabRelister
+    - swh.lister.gitlab.tasks.IncrementalGitLabLister
+    - swh.lister.gitlab.tasks.RangeGitLabLister
+    - swh.lister.gitlab.tasks.ping
+    - swh.lister.npm.tasks.NpmIncrementalListerTask
+    - swh.lister.npm.tasks.NpmListerTask
+    - swh.lister.npm.tasks.ping
+    - swh.lister.pypi.tasks.PyPIListerTask
+    - swh.lister.pypi.tasks.ping
diff --git a/conf/loader.yml b/conf/loader.yml
index df20afe..a668d25 100644
--- a/conf/loader.yml
+++ b/conf/loader.yml
@@ -1,19 +1,33 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
 lister:
   cls: local
   args:
     db: postgresql:///?service=swh
 celery:
   task_broker: amqp://guest:guest@amqp//
   task_modules:
     - swh.loader.debian.tasks
     - swh.loader.dir.tasks
     - swh.loader.git.tasks
     - swh.loader.mercurial.tasks
     - swh.loader.pypi.tasks
     - swh.loader.svn.tasks
     - swh.loader.tar.tasks
+  task_queues:
+    - swh.loader.debian.tasks.LoadDebianPackage
+    - swh.loader.dir.tasks.LoadDirRepository
+    - swh.loader.git.tasks.LoadDiskGitRepository
+    - swh.loader.git.tasks.UncompressAndLoadDiskGitRepository
+    - swh.loader.git.tasks.UpdateGitRepository
+    - swh.loader.mercurial.tasks.LoadArchiveMercurial
+    - swh.loader.mercurial.tasks.LoadMercurial
+    - swh.loader.pypi.tasks.LoadPyPI
+    - swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
+    - swh.loader.svn.tasks.LoadSvnRepository
+    - swh.loader.svn.tasks.MountAndLoadSvnRepository
+    - swh.loader.tar.tasks.LoadTarRepository
+
 lister_db_url: postgresql:///?service=swh
diff --git a/conf/vault-worker.yml b/conf/vault-worker.yml
index f0500d4..8a195ac 100644
--- a/conf/vault-worker.yml
+++ b/conf/vault-worker.yml
@@ -1,13 +1,17 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
 vault:
   cls: remote
   args:
     url: http://swh-vault-api:5005/
 celery:
   task_broker: amqp://guest:guest@amqp//
   task_modules:
     - swh.vault.cooking_tasks
+  task_queues:
+    - swh.vault.cooking_tasks.SWHBatchCookingTask
+    - swh.vault.cooking_tasks.SWHCookingTask
+
 max_bundle_size: 536870912