diff --git a/data/defaults.yaml b/data/defaults.yaml
index 48516fe9eaa6f0b4068945bc01787bbddb81ba7b..e61690acd5d65e044d1f419186bb140251f89af7 100644
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -2108,7 +2108,7 @@ swh::deploy::worker::swh_indexer::fossology_license::config:
       - swh.indexer.tasks.ContentFossologyLicense
       - swh.indexer.tasks.ContentRangeFossologyLicense
 
-swh::deploy::worker::swh_indexer::language::config_file: "language.yml"
+swh::deploy::worker::swh_indexer::language::config_file: "%{hiera('swh::conf_directory')}/indexer_content_language.yml"
 swh::deploy::worker::swh_indexer::language::concurrency: 3
 swh::deploy::worker::swh_indexer::language::loglevel: info
 # Contains a password: in private data
@@ -2123,6 +2123,12 @@ swh::deploy::worker::swh_indexer::language::config:
       type: "library"
       debian-package: "python3-pygments"
       max_content_size: 10240
+  celery:
+    task_broker: "%{alias('swh::deploy::scheduler::task_broker')}"
+    task_modules:
+      - swh.indexer.tasks
+    task_queues:
+      - swh.indexer.tasks.ContentLanguage
 
 swh::deploy::worker::swh_indexer::ctags::config_file: "%{hiera('swh::conf_directory')}/indexer_content_ctags.yml"
 swh::deploy::worker::swh_indexer::ctags::concurrency: 2
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_language.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_language.pp
index 723fda8c77f1675720f72d9708302c8837e8ed29..9dc39033d458c65253c7beff6ef16a4dd8f9bef4 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_language.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/swh_indexer_language.pp
@@ -8,14 +8,12 @@ class profile::swh::deploy::worker::swh_indexer_language {
   $task_broker = lookup('swh::deploy::worker::swh_indexer::language::task_broker')
 
   $config_file = lookup('swh::deploy::worker::swh_indexer::language::config_file')
-  $config_directory = lookup('swh::deploy::base_indexer::config_directory')
-  $config_path = "${config_directory}/${config_file}"
   $config = lookup('swh::deploy::worker::swh_indexer::language::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_content_language']
 
-  Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_language':
+  Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_content_language':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
@@ -25,11 +23,11 @@ class profile::swh::deploy::worker::swh_indexer_language {
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
-      File[$config_path],
+      File[$config_file],
     ],
   }
 
-  file {$config_path:
+  file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',