diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1941,7 +1941,7 @@
 swh::deploy::worker::swh_indexer::orchestrator::task_broker: "%{hiera('swh::deploy::worker::task_broker')}"
 swh::deploy::worker::swh_indexer::orchestrator::config:
   indexers:
-    mimetype:
+    indexer_mimetype:
       batch_size: 100
       check_presence: false
 
@@ -1950,7 +1950,7 @@
 swh::deploy::worker::swh_indexer::orchestrator_text::task_broker: "%{hiera('swh::deploy::worker::task_broker')}"
 swh::deploy::worker::swh_indexer::orchestrator_text::config:
   indexers:
-    fossology_license:
+    indexer_fossology_license:
       batch_size: 100
       check_presence: false
 
@@ -1970,8 +1970,7 @@
 swh::deploy::worker::swh_indexer::mimetype::config:
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
-  destination_queue: swh.indexer.tasks.OrchestratorTextContents
-  rescheduling_task: swh.indexer.tasks.ContentMimetype
+  destination_task: orchestrator_text
 
 swh::deploy::worker::swh_indexer::rehash::concurrency: 5
 swh::deploy::worker::swh_indexer::rehash::loglevel: "%{hiera('swh::deploy::worker::swh_indexer::base::loglevel')}"
@@ -1983,7 +1982,6 @@
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
   compute_checksums:
     - blake2s256
-  rescheduling_task: swh.indexer.tasks.RecomputeChecksums
   batch_size_retrieve_content: 10000
   batch_size_update: 5000
 
@@ -1994,7 +1992,6 @@
 swh::deploy::worker::swh_indexer::fossology_license::config:
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
-  rescheduling_task: swh.indexer.tasks.ContentFossologyLicense
   workdir: /tmp/swh/indexer.fossology.license/
   tools:
     name: 'nomos'
@@ -2009,7 +2006,6 @@
 swh::deploy::worker::swh_indexer::language::config:
   indexer_storage: "%{alias('swh::indexer::storage::config::uffizi')}"
   objstorage: "%{alias('swh::remote_service::objstorage::config')}"
-  rescheduling_task: swh.indexer.tasks.ContentLanguage
   tools:
     name: 'pygments'
     version: '2.0.1+dfsg-1.1+deb8u1'