diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -2767,18 +2767,14 @@
 swh::deploy::base_indexer::config_directory: "%{hiera('swh::conf_directory')}/indexer"
 
 swh::deploy::indexer_journal_client::config_file: "journal_client.yml"
-swh::deploy::indexer_journal_client::user: swhworker
-swh::deploy::indexer_journal_client::group: swhworker
+swh::deploy::indexer_journal_client::user: swhstorage
+swh::deploy::indexer_journal_client::group: swhstorage
 swh::deploy::indexer_journal_client::config:
   journal:
     brokers: "%{alias('swh::deploy::journal::brokers')}"
     group_id: swh.indexer.journal_client
     prefix: "%{alias('swh::deploy::journal::prefix')}"
   scheduler: "%{alias('swh::remote_service::scheduler::config::writable')}"
-  tools:
-    name: swh-metadata-detector
-    version: 0.0.2
-    configuration: {}
 
 # for all indexers
 swh::deploy::indexer::sentry_swh_package: swh.indexer
diff --git a/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp b/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/indexer_origin_intrinsic_metadata.pp
@@ -1,11 +1,14 @@
 # Deployment for swh-indexer-origin-intrinsic-metadata
+
 class profile::swh::deploy::worker::indexer_origin_intrinsic_metadata {
   include ::profile::swh::deploy::indexer
 
-  # Remove deprecated service
-  ::profile::swh::deploy::worker::instance {'indexer_origin_intrinsic_metadata':
-    ensure => absent,
+  Package[$::profile::swh::deploy::base_indexer::packages] ~> ::profile::swh::deploy::worker::instance {'indexer_origin_intrinsic_metadata':
+    ensure           => present,
+    sentry_name      => 'indexer',
+    send_task_events => true,
+    require          => [
+      Class['profile::swh::deploy::indexer'],
+    ],
   }
-
-  include ::profile::swh::deploy::indexer_journal_client
 }
diff --git a/site-modules/profile/manifests/swh/deploy/worker/instance.pp b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/instance.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
@@ -47,7 +47,6 @@
 
   $celery_hostname = $::profile::swh::deploy::worker::base::celery_hostname
 
-  $parameters_conf = "${service_basename}/parameters.conf"
   case $ensure {
     'present', 'running': {
       # Uses variables
@@ -56,7 +55,7 @@
       # - $max_tasks_per_child
       # - $celery_hostname
       # - $sentry_{dsn,environment,swh_package}
-      ::systemd::dropin_file {$parameters_conf:
+      ::systemd::dropin_file {"${service_basename}/parameters.conf":
         ensure   => present,
         unit     => $service_name,
         filename => 'parameters.conf',
@@ -93,15 +92,12 @@
       }
     }
     default: {
-      ::systemd::dropin_file {$parameters_conf:
+      ::systemd::dropin_file {"${service_basename}/parameters.conf":
         ensure   => absent,
         unit     => $service_name,
         filename => 'parameters.conf',
       }
 
-      service {$service_basename:
-        ensure  => stopped,
-      }
 
       file {$config_file:
         ensure  => absent,
diff --git a/site-modules/profile/templates/swh/deploy/journal/swh-indexer-journal-client.service.erb b/site-modules/profile/templates/swh/deploy/journal/swh-indexer-journal-client.service.erb
--- a/site-modules/profile/templates/swh/deploy/journal/swh-indexer-journal-client.service.erb
+++ b/site-modules/profile/templates/swh/deploy/journal/swh-indexer-journal-client.service.erb
@@ -16,11 +16,10 @@
 <%- if !@sentry_swh_package.nil? and !@sentry_swh_package.empty? -%>
 Environment=SWH_MAIN_PACKAGE=<%= @sentry_swh_package %>
 <%- end -%>
-Environment=SWH_CONFIG_FILENAME=<%= @config_path %>
 User=<%= @user %>
 Group=<%= @group %>
 Type=simple
-ExecStart=/usr/bin/swh indexer --config-file <%= @config_path %> journal-client '*'
+ExecStart=/usr/bin/swh indexer --config-file <%= @config_path %> journal-client
 Restart=always
 RestartSec=10
 
diff --git a/site-modules/role/manifests/swh_scheduler_with_journal_client.pp b/site-modules/role/manifests/swh_scheduler_with_journal_client.pp
--- a/site-modules/role/manifests/swh_scheduler_with_journal_client.pp
+++ b/site-modules/role/manifests/swh_scheduler_with_journal_client.pp
@@ -1,4 +1,5 @@
 # Install the swh-scheduler stack + the scheduler's journal client
 class role::swh_scheduler_with_journal_client inherits role::swh_scheduler {
   include profile::swh::deploy::scheduler::journal_client
+  include profile::swh::deploy::indexer_journal_client
 }