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,14 +1,11 @@
 # Deployment for swh-indexer-origin-intrinsic-metadata
-
 class profile::swh::deploy::worker::indexer_origin_intrinsic_metadata {
   include ::profile::swh::deploy::indexer
 
-  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'],
-    ],
+  # Remove deprecated service
+  ::profile::swh::deploy::worker::instance {'indexer_origin_intrinsic_metadata':
+    ensure => absent,
   }
+
+  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,6 +47,7 @@
 
   $celery_hostname = $::profile::swh::deploy::worker::base::celery_hostname
 
+  $parameters_conf = "${service_basename}/parameters.conf"
   case $ensure {
     'present', 'running': {
       # Uses variables
@@ -55,7 +56,7 @@
       # - $max_tasks_per_child
       # - $celery_hostname
       # - $sentry_{dsn,environment,swh_package}
-      ::systemd::dropin_file {"${service_basename}/parameters.conf":
+      ::systemd::dropin_file {$parameters_conf:
         ensure   => present,
         unit     => $service_name,
         filename => 'parameters.conf',
@@ -92,12 +93,15 @@
       }
     }
     default: {
-      ::systemd::dropin_file {"${service_basename}/parameters.conf":
+      ::systemd::dropin_file {$parameters_conf:
         ensure   => absent,
         unit     => $service_name,
         filename => 'parameters.conf',
       }
 
+      service {$service_basename:
+        ensure  => absent,
+      }
 
       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
@@ -19,7 +19,7 @@
 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 indexer origin-intrinsic-metadata
 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,5 +1,4 @@
 # 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
 }