diff --git a/data/deployments/production/azure_euwest.yaml b/data/deployments/production/azure_euwest.yaml
--- a/data/deployments/production/azure_euwest.yaml
+++ b/data/deployments/production/azure_euwest.yaml
@@ -2,7 +2,8 @@
 swh::deploy::worker::instances:
   - indexer_content_mimetype
   - indexer_fossology_license
-  - indexer_origin_intrinsic_metadata
+  # To keep from being cleaned up for now
+  # - indexer_origin_intrinsic_metadata
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::azure')}"
 swh::remote_service::indexer::config: "%{alias('swh::remote_service::indexer::config::azure')}"
diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -41,7 +41,6 @@
 swh::deploy::worker::instances:
   - indexer_content_mimetype
   - indexer_fossology_license
-  - indexer_origin_intrinsic_metadata
   - checker_deposit
   - loader_archive
   - loader_bzr
@@ -61,6 +60,8 @@
   # only in staging
   - loader_cvs
   - loader_maven
+  # To keep for clean up
+  - indexer_origin_intrinsic_metadata
 
 swh::deploy::lister::queues:
   - swh.lister.bitbucket.tasks.IncrementalBitBucketLister
diff --git a/manifests/site.pp b/manifests/site.pp
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,6 +42,7 @@
 
 node 'saatchi.internal.softwareheritage.org' {
   include role::swh_scheduler_with_journal_client
+  include profile::swh::deploy::indexer_journal_client
 }
 
 node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ {
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,9 @@
 # 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,
   }
 }
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
 }