diff --git a/benchmarks/insert_muon/Snakefile b/benchmarks/insert_muon/Snakefile
index fe9ce0ae3986e76ac7e968e8024a0b591cb6c076..42143ba84cd89b22a4a549eb2d58ac62db4b2f86 100644
--- a/benchmarks/insert_muon/Snakefile
+++ b/benchmarks/insert_muon/Snakefile
@@ -20,6 +20,7 @@ rule insert_muon_simulate:
     output:
         SIM_FILE="sim_output/insert_muon/{DETECTOR_CONFIG}_sim_mu-_{P}GeV_{INDEX}.edm4hep.root",
     params:
+        INDEX=lambda wildcards: wildcards.INDEX,
         PHYSICS_LIST="FTFP_BERT",
         DETECTOR_PATH=os.environ["DETECTOR_PATH"],
         DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -32,7 +33,7 @@ NEVENTS_SIM=1000
 # Running simulation
 npsim \
    --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
-   --skipNEvents $(( $NEVENTS_SIM * {wildcards.INDEX} )) \
+   --skipNEvents $(( $NEVENTS_SIM * {params.INDEX} )) \
    --numberOfEvents $NEVENTS_SIM \
    --physicsList {params.PHYSICS_LIST} \
    --inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/insert_neutron/Snakefile b/benchmarks/insert_neutron/Snakefile
index 98cc5a28ce173a7f7309b1d53829376300d8ffb1..2249b6fd6a91ef2cb756c10050925630adaa324c 100644
--- a/benchmarks/insert_neutron/Snakefile
+++ b/benchmarks/insert_neutron/Snakefile
@@ -21,6 +21,7 @@ rule insert_neutron_simulate:
     output:
         SIM_FILE="sim_output/insert_neutron/{DETECTOR_CONFIG}_sim_neutron_{P}GeV_{INDEX}.edm4hep.root",
     params:
+        INDEX=lambda wildcards: wildcards.INDEX,
         PHYSICS_LIST="FTFP_BERT",
         DETECTOR_PATH=os.environ["DETECTOR_PATH"],
         DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -33,7 +34,7 @@ NEVENTS_SIM=200
 # Running simulation
 npsim \
    --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
-   --skipNEvents $(( $NEVENTS_SIM * {wildcards.INDEX} )) \
+   --skipNEvents $(( $NEVENTS_SIM * {params.INDEX} )) \
    --numberOfEvents $NEVENTS_SIM \
    --physicsList {params.PHYSICS_LIST} \
    --inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/insert_tau/Snakefile b/benchmarks/insert_tau/Snakefile
index ffc9c49147dd5a404ab43fbd75621c1f32e098ce..6d10c7cfa3cf5f030f9d6a07c1866f3ca2741632 100644
--- a/benchmarks/insert_tau/Snakefile
+++ b/benchmarks/insert_tau/Snakefile
@@ -27,6 +27,7 @@ rule insert_tau_simulate:
         SIM_FILE="sim_output/insert_tau/{DETECTOR_CONFIG}_sim_tau-_{P}GeV_{INDEX}.edm4hep.root",
     params:
         N_EVENTS=get_n_events,
+        INDEX=lambda wildcards: wildcards.INDEX,
         PHYSICS_LIST="FTFP_BERT",
         DETECTOR_PATH=os.environ["DETECTOR_PATH"],
         DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -39,7 +40,7 @@ rule insert_tau_simulate:
 npsim \
    --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
    --numberOfEvents {params.N_EVENTS} \
-   --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+   --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
    --physicsList {params.PHYSICS_LIST} \
    --inputFiles {input.GEN_FILE} \
    --outputFile {output.SIM_FILE}
diff --git a/benchmarks/zdc_lambda/Snakefile b/benchmarks/zdc_lambda/Snakefile
index d4f89fac1e48ab547a489c62b71bb4cfa37fb51c..335f0a52ef34c5a747a4f6981dc9be82598ef59e 100644
--- a/benchmarks/zdc_lambda/Snakefile
+++ b/benchmarks/zdc_lambda/Snakefile
@@ -19,6 +19,7 @@ rule zdc_lambda_simulate:
                 SIM_FILE="sim_output/zdc_lambda/{DETECTOR_CONFIG}_sim_lambda_dec_{P}GeV_{INDEX}.edm4hep.root",
         params:
                 N_EVENTS=200,
+                INDEX=lambda wildcards: wildcards.INDEX,
                 PHYSICS_LIST="FTFP_BERT",
                 DETECTOR_PATH=os.environ["DETECTOR_PATH"],
                 DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -30,7 +31,7 @@ rule zdc_lambda_simulate:
 # Running simulation
 npsim \
    --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
-   --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+   --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
    --numberOfEvents {params.N_EVENTS} \
    --physicsList {params.PHYSICS_LIST} \
    --inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/zdc_photon/Snakefile b/benchmarks/zdc_photon/Snakefile
index 3e653a13e84fa80f939adc5f3844be507d45368a..76adc7e5d4afbcac8bb7e7005f6930309ba8bf83 100644
--- a/benchmarks/zdc_photon/Snakefile
+++ b/benchmarks/zdc_photon/Snakefile
@@ -22,6 +22,7 @@ rule zdc_photon_simulate:
                 SIM_FILE="sim_output/zdc_photon/{DETECTOR_CONFIG}_sim_zdc_photon_{P}GeV_{INDEX}.edm4hep.root",
         params:
                 N_EVENTS=200,
+                INDEX=lambda wildcards: wildcards.INDEX,
                 PHYSICS_LIST="FTFP_BERT",
                 DETECTOR_PATH=os.environ["DETECTOR_PATH"],
                 DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -34,7 +35,7 @@ rule zdc_photon_simulate:
 npsim \
    --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
    --physicsList {params.PHYSICS_LIST} \
-   --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+   --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
    --numberOfEvents {params.N_EVENTS} \
    --inputFiles {input.GEN_FILE} \
    --outputFile {output.SIM_FILE}
diff --git a/benchmarks/zdc_pi0/Snakefile b/benchmarks/zdc_pi0/Snakefile
index 320a20f31c6ea99992a8936bca6f79083789afc8..7770d56633d874a977cee2a8434ece0bede5b020 100644
--- a/benchmarks/zdc_pi0/Snakefile
+++ b/benchmarks/zdc_pi0/Snakefile
@@ -20,6 +20,7 @@ rule zdc_pi0_simulate:
                 SIM_FILE="sim_output/zdc_pi0/{DETECTOR_CONFIG}_sim_zdc_pi0_{P}GeV_{INDEX}.edm4hep.root",
         params:
                 N_EVENTS=200,
+                INDEX=lambda wildcards: wildcards.INDEX,
                 PHYSICS_LIST="FTFP_BERT",
                 DETECTOR_PATH=os.environ["DETECTOR_PATH"],
                 DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -31,7 +32,7 @@ rule zdc_pi0_simulate:
 # Running simulation
 npsim \
    --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
-   --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+   --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
    --numberOfEvents {params.N_EVENTS} \
    --physicsList {params.PHYSICS_LIST} \
    --inputFiles {input.GEN_FILE} \
diff --git a/benchmarks/zdc_sigma/Snakefile b/benchmarks/zdc_sigma/Snakefile
index b7836e82ca1bf944566e099e6720a5a2b444e9ec..704016672e8dc6cfc17a75fdb8bd989aed25706f 100644
--- a/benchmarks/zdc_sigma/Snakefile
+++ b/benchmarks/zdc_sigma/Snakefile
@@ -19,6 +19,7 @@ rule zdc_sigma_simulate:
                 SIM_FILE="sim_output/zdc_sigma/{DETECTOR_CONFIG}_sim_sigma_dec_{P}GeV_{INDEX}.edm4hep.root",
         params:
                 N_EVENTS=200,
+                INDEX=lambda wildcards: wildcards.INDEX,
                 PHYSICS_LIST="FTFP_BERT",
                 DETECTOR_PATH=os.environ["DETECTOR_PATH"],
                 DETECTOR_CONFIG=lambda wildcards: wildcards.DETECTOR_CONFIG,
@@ -30,7 +31,7 @@ rule zdc_sigma_simulate:
 # Running simulation
 npsim \
    --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
-   --skipNEvents $(( {params.N_EVENTS} * {wildcards.INDEX} )) \
+   --skipNEvents $(( {params.N_EVENTS} * {params.INDEX} )) \
    --numberOfEvents {params.N_EVENTS} \
    --physicsList {params.PHYSICS_LIST} \
    --inputFiles {input.GEN_FILE} \