diff --git a/benchmarks/femc_electron/config.yml b/benchmarks/femc_electron/config.yml
index a600454d1f2a7b20b2450d22f4ed144717d2d901..7b6f1043faf7e817b560820c1347e1e671892e8e 100644
--- a/benchmarks/femc_electron/config.yml
+++ b/benchmarks/femc_electron/config.yml
@@ -1,6 +1,6 @@
 sim:femc_electron:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 10
@@ -20,13 +20,14 @@ sim:femc_electron:
       - runner_system_failure
 
 bench:femc_electron:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:femc_electron"]
   script:
     - snakemake --cores 1 results/epic_craterlake/femc_electron
 
 collect_results:femc_electron:
+  extends: .det_benchmark
   stage: collect
   needs: ["bench:femc_electron"]
   script:
diff --git a/benchmarks/femc_photon/config.yml b/benchmarks/femc_photon/config.yml
index a367e5093dccb1dc5b9642f2fede452a5c46f85a..af710897b9a022555e857227a44dec2c05926489 100644
--- a/benchmarks/femc_photon/config.yml
+++ b/benchmarks/femc_photon/config.yml
@@ -1,6 +1,6 @@
 sim:femc_photon:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 10
@@ -20,13 +20,14 @@ sim:femc_photon:
       - runner_system_failure
 
 bench:femc_photon:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:femc_photon"]
   script:
     - snakemake --cores 1 results/epic_craterlake/femc_photon
 
 collect_results:femc_photon:
+  extends: .det_benchmark
   stage: collect
   needs: ["bench:femc_photon"]
   script:
diff --git a/benchmarks/femc_pi0/config.yml b/benchmarks/femc_pi0/config.yml
index bcbd90afd07241217dc64b712fc209a3cf0bf84d..46e6ed9e73cd3a2606db2445b266cf8c4765f1c9 100644
--- a/benchmarks/femc_pi0/config.yml
+++ b/benchmarks/femc_pi0/config.yml
@@ -1,6 +1,6 @@
 sim:femc_pi0:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 10
@@ -11,7 +11,6 @@ sim:femc_pi0:
       - P: 60
       - P: 70
       - P: 80
-  timeout: 1 hours
   script:
     - snakemake --cores 1 sim_output/femc_pi0/epic_craterlake_rec_pi0_${P}GeV.edm4eic.root
   retry:
@@ -20,13 +19,14 @@ sim:femc_pi0:
       - runner_system_failure
 
 bench:femc_pi0:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:femc_pi0"]
   script:
     - snakemake --cores 1 results/epic_craterlake/femc_pi0
 
 collect_results:femc_pi0:
+  extends: .det_benchmark
   stage: collect
   needs: ["bench:femc_pi0"]
   script:
diff --git a/benchmarks/insert_muon/config.yml b/benchmarks/insert_muon/config.yml
index 252cd6e82900f2a6e6432082e183731e15049476..76899c1d9e07b193fe41c44f46a0d841f51f85a6 100644
--- a/benchmarks/insert_muon/config.yml
+++ b/benchmarks/insert_muon/config.yml
@@ -1,6 +1,6 @@
 sim:insert_muon:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 50
@@ -12,13 +12,14 @@ sim:insert_muon:
       - runner_system_failure
 
 bench:insert_muon:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:insert_muon"]
   script:
     - snakemake --cores 1 results/epic_craterlake/insert_muon
 
 collect_results:insert_muon:
+  extends: .det_benchmark
   stage: collect
   needs: ["bench:insert_muon"]
   script:
diff --git a/benchmarks/insert_neutron/config.yml b/benchmarks/insert_neutron/config.yml
index 4c723e68d59151033961554993eca884c2beb9cc..eedac937686f729f3785bf63dae812fcd2768ce4 100644
--- a/benchmarks/insert_neutron/config.yml
+++ b/benchmarks/insert_neutron/config.yml
@@ -1,6 +1,6 @@
 sim:insert_neutron:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 20
@@ -18,13 +18,14 @@ sim:insert_neutron:
       - runner_system_failure
 
 bench:insert_neutron:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:insert_neutron"]
   script:
     - snakemake --cores 1 results/epic_craterlake/insert_neutron
 
 collect_results:insert_neutron:
+  extends: .det_benchmark
   stage: collect
   needs: ["bench:insert_neutron"]
   script:
diff --git a/benchmarks/zdc_lambda/config.yml b/benchmarks/zdc_lambda/config.yml
index e62b0d9ce3eb1f72d00464e0edb7c89abe0ebb88..e6b1603166308c01011962fd5b1eafd9f01f9355 100644
--- a/benchmarks/zdc_lambda/config.yml
+++ b/benchmarks/zdc_lambda/config.yml
@@ -1,6 +1,6 @@
 sim:zdc_lambda:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 100
@@ -19,13 +19,14 @@ sim:zdc_lambda:
       - runner_system_failure
 
 bench:zdc_lambda:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:zdc_lambda"]
   script:
     - snakemake --cores 1 results/epic_zdc_sipm_on_tile_only/zdc_lambda
 
 collect_results:zdc_lambda:
+  extends: .det_benchmark
   stage: collect
   needs: ["bench:zdc_lambda"]
   script:
diff --git a/benchmarks/zdc_photon/config.yml b/benchmarks/zdc_photon/config.yml
index 4d205eb2e138615209e7c6420fb96bf995bf8745..aee4f6c60254097e552f4952e3d5e6202b007b31 100644
--- a/benchmarks/zdc_photon/config.yml
+++ b/benchmarks/zdc_photon/config.yml
@@ -1,6 +1,6 @@
 sim:zdc_photon:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 20
@@ -19,14 +19,15 @@ sim:zdc_photon:
       - runner_system_failure
 
 bench:zdc_photon:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:zdc_photon"]
   script:
     - mkdir -p results/epic_zdc_sipm_on_tile_only
     - python benchmarks/zdc_photon/analysis/zdc_photon_plots.py results/epic_zdc_sipm_on_tile_only/zdc_photon
 
 collect_results:zdc_photon:
+  extends: .det_benchmark
   stage: collect
   extends: .det_benchmark
   needs: ["bench:zdc_photon"]
diff --git a/benchmarks/zdc_pi0/config.yml b/benchmarks/zdc_pi0/config.yml
index ae2c1fd9ae968d4cd1168a285d54190c396d0413..f0b8993e843ec214865a968b06af0c019e23c3d2 100644
--- a/benchmarks/zdc_pi0/config.yml
+++ b/benchmarks/zdc_pi0/config.yml
@@ -1,6 +1,6 @@
 sim:zdc_pi0:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 60
@@ -16,17 +16,16 @@ sim:zdc_pi0:
       - runner_system_failure
 
 bench:zdc_pi0:
-  stage: benchmarks
-  
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:zdc_pi0"]
   script:
     - mkdir -p results/epic_zdc_sipm_on_tile_only
     - python benchmarks/zdc_pi0/analysis/zdc_pi0_plots.py results/epic_zdc_sipm_on_tile_only/zdc_pi0
 
 collect_results:zdc_pi0:
-  stage: collect
   extends: .det_benchmark
+  stage: collect
   needs: ["bench:zdc_pi0"]
   script:
     - ls -al
diff --git a/benchmarks/zdc_sigma/config.yml b/benchmarks/zdc_sigma/config.yml
index 5a49051088d4a0091e87763320571924307c9e4d..af204d4254a4ab0b48c1fa737fb33454f358bc41 100644
--- a/benchmarks/zdc_sigma/config.yml
+++ b/benchmarks/zdc_sigma/config.yml
@@ -1,6 +1,6 @@
 sim:zdc_sigma:
-  stage: simulate
   extends: .det_benchmark
+  stage: simulate
   parallel:
     matrix:
       - P: 100
@@ -19,13 +19,14 @@ sim:zdc_sigma:
       - runner_system_failure
 
 bench:zdc_sigma:
-  stage: benchmarks
   extends: .det_benchmark
+  stage: benchmarks
   needs: ["sim:zdc_sigma"]
   script:
     - snakemake --cores 1 results/epic_zdc_sipm_on_tile_only/zdc_sigma
 
 collect_results:zdc_sigma:
+  extends: .det_benchmark
   stage: collect
   needs: ["bench:zdc_sigma"]
   script: