diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 111e025c8837788439bd362e536b877a6f0703a8..ca49434e64723707ec28f75c82185464d2597c83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,99 +63,92 @@ get_data:
     - ln -s ${LOCAL_DATA_PATH}/datasets/data data
     - cd ${LOCAL_DATA_PATH} && git clone --depth=1 https://eicweb.phy.anl.gov/EIC/datasets.git datasets
 
-
-#generate_config:
-#  stage: ci_gen
-#  tags:
-#    - silicon
-#  script:
-#    - ./bin/gen_ci_config -p track_test_ -i trackers > results/trackers_config.yml
-#    - ./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
-
-roman_pot_simu:
-  stage: simulate
-  needs: 
-    - ["get_data","detector"]
-  script:
-    - bash benchmarks/trackers/roman_pot_simu.sh
-
-roman_pot_nhits:
-  stage: benchmarks
-  needs:
-    - ["roman_pot_simu","detector"]
-  script:
-    - root -b -q benchmarks/trackers/simple_tracking.cxx+
-  allow_failure: true
-
-roman_pot_eta:
-  stage: benchmarks
-  needs:
-    - ["roman_pot_simu","detector"]
-  script:
-    - root -b -q benchmarks/trackers/roman_pot_hit_eta.cxx+
-  allow_failure: true
-
-zdc_simulation:
-  stage: simulate
-  needs: 
-    - ["get_data","detector"]
-  script:
-    - 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","detector"]
-  script:
-    - ls -lrth sim_output
-    - root -b -q benchmarks/calorimeters/simple_checking.cxx+
-  allow_failure: true
-
-zdc_benchmark_info_histogram:
-  stage: benchmarks
-  needs: 
-    - ["zdc_simulation","detector"]
-  script:
-    - root -b -q benchmarks/calorimeters/simple_info_plot_histograms.cxx+
-  allow_failure: true
-
-crystal_emcal_simulation:
-  stage: simulate
-  needs: 
-    - ["get_data","detector"]
-  tags:
-    - silicon
-  script:
-    - bash benchmarks/calorimeters/run_simulation_crystal.sh
-
-crystal_benchmark:
-  stage: benchmarks
-  needs:
-    - ["crystal_emcal_simulation","detector"]
-  script:
-    - ls -lrth sim_output
-    - root -b -q benchmarks/calorimeters/simple_checking_crystal.cxx+
-  allow_failure: true
-
-crystal_pion_simulation:
-  stage: simulate
-  needs:
-    - ["get_data","detector"]
-  tags:
-    - silicon
-  script:
-    - source options/env.sh
-    - npsim --runType batch --numberOfEvents 100 --compactFile ${DETECTOR_PATH}/topside.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.root
+include: 
+  - local: 'benchmarks/trackers/config.yml'
+  - local: 'benchmarks/calorimeters/config.yml'
+  - local: 'benchmarks/pid/config.yml'
+
+    #roman_pot_simu:
+    #  stage: simulate
+    #  needs: 
+    #    - ["get_data","detector"]
+    #  script:
+    #    - bash benchmarks/trackers/roman_pot_simu.sh
+    #
+    #roman_pot_nhits:
+    #  stage: benchmarks
+    #  needs:
+    #    - ["roman_pot_simu","detector"]
+    #  script:
+    #    - root -b -q benchmarks/trackers/simple_tracking.cxx+
+    #  allow_failure: true
+    #
+    #roman_pot_eta:
+    #  stage: benchmarks
+    #  needs:
+    #    - ["roman_pot_simu","detector"]
+    #  script:
+    #    - root -b -q benchmarks/trackers/roman_pot_hit_eta.cxx+
+    #  allow_failure: true
+    #
+    #zdc_simulation:
+    #  stage: simulate
+    #  needs: 
+    #    - ["get_data","detector"]
+    #  script:
+    #    - 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","detector"]
+    #  script:
+    #    - ls -lrth sim_output
+    #    - root -b -q benchmarks/calorimeters/simple_checking.cxx+
+    #  allow_failure: true
+    #
+    #zdc_benchmark_info_histogram:
+    #  stage: benchmarks
+    #  needs: 
+    #    - ["zdc_simulation","detector"]
+    #  script:
+    #    - root -b -q benchmarks/calorimeters/simple_info_plot_histograms.cxx+
+    #  allow_failure: true
+    #
+    #crystal_emcal_simulation:
+    #  stage: simulate
+    #  needs: 
+    #    - ["get_data"]
+    #  script:
+    #     bash benchmarks/calorimeters/run_simulation_crystal.sh
+    #
+    #crystal_benchmark:
+    #  stage: benchmarks
+    #  needs:
+    #    - ["crystal_emcal_simulation","detector"]
+    #  script:
+    #    - ls -lrth sim_output
+    #    - root -b -q benchmarks/calorimeters/simple_checking_crystal.cxx+
+    #  allow_failure: true
+    #
+    #crystal_pion_simulation:
+    #  stage: simulate
+    #  needs:
+    #    - ["get_data","detector"]
+    #  tags:
+    #    - silicon
+    #  script:
+    #    - source options/env.sh
+    #    - npsim --runType batch --numberOfEvents 100 --compactFile ${DETECTOR_PATH}/topside.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.root
 
 deploy_results:
   stage: deploy