diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -2078,8 +2078,9 @@
 swh::deploy::indexer_journal_client::user: swhstorage
 swh::deploy::indexer_journal_client::group: swhstorage
 swh::deploy::indexer_journal_client::config:
-  brokers: "%{alias('swh::deploy::journal::brokers')}"
-  consumer_id: swh.indexer.journal_client
+  journal:
+    brokers: "%{alias('swh::deploy::journal::brokers')}"
+    group_id: swh.indexer.journal_client
   scheduler: "%{alias('swh::remote_service::scheduler::config::writable')}"
 
 swh::deploy::worker::indexer_content_mimetype::config_file: "%{hiera('swh::conf_directory')}/indexer_content_mimetype.yml"
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
@@ -10,7 +10,7 @@
 User=<%= @user %>
 Group=<%= @group %>
 Type=simple
-ExecStart=/usr/bin/python3 -m swh.indexer.journal_client
+ExecStart=/usr/bin/swh indexer --config-file <%= @config_path %> journal-client
 Restart=always
 RestartSec=10