diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -3484,7 +3484,7 @@
 swh::deploy::search::conf_file: "%{hiera('swh::deploy::base_search::config_directory')}/server.yml"
 swh::deploy::search::user: "%{alias('swh::deploy::base_search::user')}"
 swh::deploy::search::group: "%{alias('swh::deploy::base_search::group')}"
-swh::deploy::search::index: origin
+swh::deploy::search::index: origin-production
 swh::deploy::search::config:
   search:
     cls: elasticsearch
@@ -3495,19 +3495,19 @@
         read_alias: origin-read
         write_alias: origin-write
 
-
 swh::deploy::search::journal_client::service_types:
   - objects
   - indexed
 
 swh::deploy::search::journal_client::objects::config_file: "%{lookup('swh::deploy::base_search::config_directory')}/journal_client_objects.yml"
+swh::deploy::search::journal_client::objects::consumer_group: swh.search.journal_client
 swh::deploy::search::journal_client::objects::config:
   search:
     cls: elasticsearch
     hosts: "%{alias('swh::elasticsearch::search_nodes')}"
   journal:
     brokers: "%{alias('swh::deploy::journal::brokers')}"
-    group_id: swh.search.journal_client
+    group_id: "%{alias('swh::deploy::search::journal_client::objects::consumer_group')}"
     prefix: swh.journal.objects
     object_types:
       - origin
@@ -3515,13 +3515,14 @@
       - origin_visit_status
 
 swh::deploy::search::journal_client::indexed::config_file: "%{lookup('swh::deploy::base_search::config_directory')}/journal_client_indexed.yml"
+swh::deploy::search::journal_client::indexed::consumer_group: swh.search.journal_client.indexed
 swh::deploy::search::journal_client::indexed::config:
   search:
     cls: elasticsearch
     hosts: "%{alias('swh::elasticsearch::search_nodes')}"
   journal:
     brokers: "%{alias('swh::deploy::journal::brokers')}"
-    group_id: swh.search.journal_client.indexed
+    group_id: "%{alias('swh::deploy::search::journal_client::indexed::consumer_group')}"
     prefix: swh.journal.indexed
     object_types:
       - origin_intrinsic_metadata
diff --git a/data/deployments/production/common.yaml b/data/deployments/production/common.yaml
--- a/data/deployments/production/common.yaml
+++ b/data/deployments/production/common.yaml
@@ -19,8 +19,6 @@
 
 swh::postgresql::shared_buffers: 4GB
 
-swh::deploy::search::index: origin-production
-
 swh::deploy::webapp::url: "https://archive.softwareheritage.org"
 
 # e2e checks on vault
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
@@ -302,7 +302,6 @@
   - host: search-esnode0.internal.staging.swh.network
     port: 9200
 
-swh::deploy::search::backend::listen::host: 0.0.0.0
 swh::remote_service::search::config:
   cls: remote
   url: "http://search0.internal.staging.swh.network:%{hiera('swh::remote_service::search::port')}/"
@@ -313,9 +312,13 @@
 swh::deploy::webapp::config::es_workers_index_url: http://search-esnode0.internal.staging.swh.network:9200/swh_workers-*
 swh::deploy::webapp::metadata_search_backend: swh-search
 
+swh::deploy::search::index: origin-v0.9.0
+swh::deploy::search::backend::listen::host: 0.0.0.0
 swh::deploy::search::journal_client::service_types:
   - objects
   - indexed
+swh::deploy::search::journal_client::objects::consumer_group: swh.search.journal_client-v0.9.0
+swh::deploy::search::journal_client::indexed::consumer_group: swh.search.journal_client.indexed-v0.9.0
 
 swh::deploy::webapp::url: "https://webapp.staging.swh.network"
 
@@ -331,4 +334,3 @@
   uri: '/browse/snapshot/48dcf76ec1a3bd57ec117b1dace633691fdfd70d/branches/'
   regexp:
     - 'refs/tags/syslinux-3.20-pre2.*refs/tags/syslinux-3.20-pre3.*'
-