diff --git a/webservice/webservice.py b/webservice/webservice.py
index e11827770b303426fbd0e23a1aaf17c1fcf11b2f..123f0bc33021b15c0b4c939c26300d97b20843a2 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -691,9 +691,9 @@ async def server_runner(config, mode):
                     cmd = ["python", "-m", "xfel_calibrate.calibrate",
                            detector, "DARK", '--priority', priority,
                            '--slurm-scheduling', str(config[action]['sched-prio']),  # noqa
-                           '--slurm-name',
-                           '{}_{}_{}_p{:06d}_r{:04d}'.format(action,
-                                    instrument, detector, proposal, runnr)]
+                           '--slurm-name', '{}_{}_{}_{}_p{}_r{}'
+                               .format(action, instrument, detector, cycle,
+                                       proposal, "_r".join(wait_runs))]
 
                     # Avoid giving a reservation parameter after the
                     # ITDM changes for giving xcal high priority by default
@@ -763,8 +763,10 @@ async def server_runner(config, mode):
                     cmd = ["python", "-m", "xfel_calibrate.calibrate",
                            detector, "CORRECT", '--slurm-scheduling',
                            str(config[action]['sched-prio']), '--slurm-name',
-                           '{}_{}_{}_{}_{}'.format(action, instrument,
-                                                   detector, proposal, runnr)]
+                           '{}_{}_{}_{}_p{}_r{}'.format(action, instrument,
+                                                        detector, cycle,
+                                                        proposal,
+                                                        "_r".join(wait_runs))]
 
                     cmd = await parse_config(cmd, dconfig)