diff --git a/docker/conf/lister.yml b/docker/conf/lister.yml
index af2f1b1..02141d3 100644
--- a/docker/conf/lister.yml
+++ b/docker/conf/lister.yml
@@ -1,60 +1,37 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
 
 scheduler:
   cls: remote
   args:
     url: http://swh-scheduler:5008/
 
 lister:
   cls: local
   args:
     db: postgresql://postgres@swh-listers-db/swh-listers
 
 celery:
   task_broker: amqp://guest:guest@amqp//
-  task_modules:
-    - swh.lister.bitbucket.tasks
-    - swh.lister.cgit.tasks
-    - swh.lister.cran.tasks
-    - swh.lister.debian.tasks
-    - swh.lister.github.tasks
-    - swh.lister.gitlab.tasks
-    - swh.lister.gnu.tasks
-    - swh.lister.npm.tasks
-    - swh.lister.packagist.tasks
-    - swh.lister.phabricator.tasks
-    - swh.lister.pypi.tasks
   task_queues:
     - swh.lister.bitbucket.tasks.FullBitBucketRelister
     - swh.lister.bitbucket.tasks.IncrementalBitBucketLister
     - swh.lister.bitbucket.tasks.RangeBitBucketLister
-    - swh.lister.bitbucket.tasks.ping
     - swh.lister.cgit.tasks.CGitListerTask
-    - swh.lister.cgit.tasks.ping
     - swh.lister.cran.tasks.CRANListerTask
-    - swh.lister.cran.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.gnu.tasks.GNUListerTask
-    - swh.lister.gnu.tasks.ping
     - swh.lister.npm.tasks.NpmIncrementalListerTask
     - swh.lister.npm.tasks.NpmListerTask
-    - swh.lister.npm.tasks.ping
     - swh.lister.packagist.tasks.PackagistListerTask
-    - swh.lister.packagist.tasks.ping
     - swh.lister.phabricator.tasks.FullPhabricatorLister
     - swh.lister.phabricator.tasks.IncrementalPhabricatorLister
-    - swh.lister.phabricator.tasks.ping
     - swh.lister.pypi.tasks.PyPIListerTask
-    - swh.lister.pypi.tasks.ping
diff --git a/docker/conf/loader.yml b/docker/conf/loader.yml
index 1517c95..0116924 100644
--- a/docker/conf/loader.yml
+++ b/docker/conf/loader.yml
@@ -1,54 +1,44 @@
 storage:
   cls: filter
   args:
     storage:
       cls: buffer
       args:
         storage:
           cls: remote
           args:
             url: http://swh-storage:5002/
         min_batch_size:
           content: 10000
           content_bytes: 104857600
           directory: 1000
           revision: 1000
 
 scheduler:
   cls: remote
   args:
     url: http://swh-scheduler:5008/
 
 celery:
   task_broker: amqp://guest:guest@amqp//
-  task_modules:
-    - swh.loader.git.tasks
-    - swh.loader.mercurial.tasks
-    - swh.loader.svn.tasks
-    - swh.deposit.loader.tasks
-    - swh.loader.package.archive.tasks
-    - swh.loader.package.debian.tasks
-    - swh.loader.package.deposit.tasks
-    - swh.loader.package.npm.tasks
-    - swh.loader.package.pypi.tasks
 
   task_queues:
     - 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.package.tasks.archive.LoadArchive
     - swh.loader.package.tasks.debian.LoadDebian
     - swh.loader.package.tasks.deposit.LoadDeposit
     - swh.loader.package.tasks.npm.LoadNpm
     - swh.loader.package.tasks.pypi.LoadPyPI
     - swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
     - swh.loader.svn.tasks.LoadSvnRepository
     - swh.loader.svn.tasks.MountAndLoadSvnRepository
     - swh.deposit.loader.tasks.ChecksDepositTsk
 
 lister_db_url: postgresql://postgres@swh-listers-db/swh-listers
 
 url: 'http://swh-deposit:5006'