diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1eabccc45620542eb7ea2dfe6f273eb4a5bb13b2..9f0b97c3a7af32caf7986f0ff3338401f1ab23e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,18 +68,10 @@ get_data:
 #    - ./bin/gen_ci_config -p cal_test_   -i calorimeters > results/calorimeters_config.yml
 #    - ./bin/gen_ci_config -p pid_test_   -i pid > results/pid_config.yml
 
-cal_test_3_zdc_neutrons_reader:
-  stage: benchmarks
-  needs: 
-    - ["zdc_simulation"]
-  script:
-    - root -b -q benchmarks/calorimeters/zdc_neutrons_reader.cxx
-  allow_failure: true
-
 roman_pot_simu:
   stage: simulate
   needs: 
-    - ["get_data"]
+    - ["get_data","detector"]
   script:
     - cp NPDet/src/detectors/trackers/compact/elements.xml ./.
     - cp NPDet/src/detectors/trackers/compact/materials.xml ./.
@@ -88,7 +80,7 @@ roman_pot_simu:
 roman_pot_nhits:
   stage: benchmarks
   needs:
-    - ["roman_pot_simu"]
+    - ["roman_pot_simu","detector"]
   script:
     - root -b -q benchmarks/trackers/simple_tracking.cxx+
   allow_failure: true
@@ -96,7 +88,7 @@ roman_pot_nhits:
 roman_pot_eta:
   stage: benchmarks
   needs:
-    - ["roman_pot_simu"]
+    - ["roman_pot_simu","detector"]
   script:
     - root -b -q benchmarks/trackers/roman_pot_hit_eta.cxx+
   allow_failure: true
@@ -104,16 +96,25 @@ roman_pot_eta:
 zdc_simulation:
   stage: simulate
   needs: 
-    - ["get_data"]
+    - ["get_data","detector"]
   script:
     - cp NPDet/src/detectors/calorimeters/compact/elements.xml ./.
     - cp NPDet/src/detectors/calorimeters/compact/materials.xml ./.
     - bash benchmarks/calorimeters/run_simulation_zdc.sh
 
+cal_test_3_zdc_neutrons_reader:
+  stage: benchmarks
+  needs: 
+    - ["zdc_simulation","detector"]
+  script:
+    - root -b -q benchmarks/calorimeters/zdc_neutrons_reader.cxx
+  allow_failure: true
+
+
 zdc_benchmark:
   stage: benchmarks
   needs: 
-    - ["zdc_simulation"]
+    - ["zdc_simulation","detector"]
   script:
     - ls -lrth sim_output
     - root -b -q benchmarks/calorimeters/simple_checking.cxx+
@@ -122,7 +123,7 @@ zdc_benchmark:
 zdc_benchmark_info_histogram:
   stage: benchmarks
   needs: 
-    - ["zdc_simulation"]
+    - ["zdc_simulation","detector"]
   script:
     - cp NPDet/src/detectors/calorimeters/compact/elements.xml calorimeters/
     - cp NPDet/src/detectors/calorimeters/compact/materials.xml calorimeters/
@@ -132,7 +133,7 @@ zdc_benchmark_info_histogram:
 crystal_emcal_simulation:
   stage: simulate
   needs: 
-    - ["get_data"]
+    - ["get_data","detector"]
   tags:
     - silicon
   script:
@@ -143,7 +144,7 @@ crystal_emcal_simulation:
 crystal_benchmark:
   stage: benchmarks
   needs:
-    - ["crystal_emcal_simulation"]
+    - ["crystal_emcal_simulation","detector"]
   script:
     - ls -lrth sim_output
     - root -b -q benchmarks/calorimeters/simple_checking_crystal.cxx+
@@ -152,7 +153,7 @@ crystal_benchmark:
 crystal_pion_simulation:
   stage: simulate
   needs:
-    - ["get_data"]
+    - ["get_data","detector"]
   tags:
     - silicon
   script:
@@ -162,7 +163,7 @@ crystal_pion_simulation:
 deploy_results:
   stage: deploy
   needs:
-    - ["zdc_benchmark","zdc_benchmark_info_histogram"]
+    - ["zdc_benchmark","zdc_benchmark_info_histogram","detector"]
   tags:
     - silicon
   script: