diff --git a/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer.yml b/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer.yml
index 1c53fda..8e7e99d 100644
--- a/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer.yml
+++ b/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer.yml
@@ -1,24 +1,24 @@
 storage:
   cls: cassandra
   args:
     hosts: {{ cassandra_seed_ips.split(',') }}
     keyspace: swh
     objstorage:
       cls: memory
       args: {}
 
 journal_client:
       cls: kafka
       brokers:
 {% for broker in journal.brokers %}
         - {{ broker }}
 {% endfor %}
       sasl.username: {{ journal.consumer.user }}
       sasl.password: {{ journal_consumer_password }}
       security.protocol: sasl_ssl
       sasl.mechanism: SCRAM-SHA-512
       # The prefix must match the username
-      group_id: {{ journal.consumer.group }}
+      group_id: {{ journal.consumer.group }}-{{ item }}
       batch_size: 2000
       object_types:
         - {{ item }}
diff --git a/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer@.service b/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer@.service
index 03e77d9..dddb30a 100644
--- a/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer@.service
+++ b/sysadmin/grid5000/cassandra/ansible/templates/swhstorage/replayer@.service
@@ -1,21 +1,20 @@
 [Unit]
 Description=swh storage {{ item }} replayer
 ConditionPathExists=/etc/softwareheritage/replayer/replayer-{{ item }}.yml
 PartOf=replayer-{{item}}.target
 
 [Service]
-Type=forking
+Type=simple
 User=swhstorage
 Group=swhstorage
-PIDFile=/run/replayer/replayer-{{item}}-%i.pid
 Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/replayer/replayer-{{ item }}.yml
-Environment=SWH_LOG_TARGET=journal
+#Environment=SWH_LOG_TARGET=journal
 Environment=STATSD_PORT=9125
-ExecStart=daemonize -p /run/replayer/replayer-{{item}}-%i.pid /usr/bin/swh storage replay
-ExecStop=/bin/kill -TERM $MAINPID
-ExecReload=/bin/kill -HUP $MAINPID
-# Restart=Always
+ExecStart=/usr/bin/swh storage replay
+# ExecStop=/bin/kill -TERM $MAINPID
+# ExecReload=/bin/kill -HUP $MAINPID
+# Restart=on-failure
 # RestartSec=10
 
 [Install]
 WantedBy=multi-user.target