diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6604d58495355ebd610f5c68a6734025ddcc7456..043385ab1eb0854659e6df2efb2d7cd5b0210b5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,15 +10,14 @@ default:
 
 stages:
   - build
-  - data_init
   - config
   - run
   - benchmarks1
   - benchmarks2
   - finish
 
-get_data:
-  stage: data_init
+configure:
+  stage: config
   script:
     - mkdir -p results
     - mkdir -p config
diff --git a/clustering/barrel_clusters.sh b/clustering/barrel_clusters.sh
index ecee95847ffacd5531826698aca1758028442886..2d989861c087369ee6394b4ade11fa7b231485b7 100644
--- a/clustering/barrel_clusters.sh
+++ b/clustering/barrel_clusters.sh
@@ -24,6 +24,10 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 ## Build the detector constructors.
 git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
 mkdir ${JUGGLER_DETECTOR}/build
 pushd ${JUGGLER_DETECTOR}/build
 cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/clustering/clustering_config.yml b/clustering/clustering_config.yml
index 89bfc9cac6c4cddc10ec2c54f189b7504fdde236..34eea7613ea54fa9da3ea514677a4fe97af47533 100644
--- a/clustering/clustering_config.yml
+++ b/clustering/clustering_config.yml
@@ -2,7 +2,7 @@ clustering_barrel_electrons:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
   tags:
     - silicon
-  needs: ["get_data"]
+  needs: ["configure"]
   timeout: 24 hours
   artifacts:
     expire_in: 20 weeks
diff --git a/ecal/ecal_config.yml b/ecal/ecal_config.yml
index a4bb8ff633ac519b6ae9c064e6250e104939c521..a949bafa0657c677a981cfefffb6626b7f2d4ace 100644
--- a/ecal/ecal_config.yml
+++ b/ecal/ecal_config.yml
@@ -2,7 +2,7 @@ ecal_1_emcal_electrons:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
   tags:
     - silicon
-  needs: ["get_data"]
+  needs: ["configure"]
   timeout: 24 hours
   artifacts:
     expire_in: 20 weeks
@@ -16,6 +16,7 @@ ecal_1_emcal_pi0s:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
   tags:
     - silicon
+  needs: ["configure"]
   timeout: 12 hours 30 minutes
   artifacts:
     expire_in: 20 weeks
diff --git a/ecal/emcal_electrons.sh b/ecal/emcal_electrons.sh
index 9cfc1f3095e2986930f4dc91dcd5b4b1e978a5b9..cd33ad36c7105ed87365b0bfc85b6e3ab26d9879 100644
--- a/ecal/emcal_electrons.sh
+++ b/ecal/emcal_electrons.sh
@@ -32,6 +32,10 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Build the detector constructors.
 git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
 mkdir ${JUGGLER_DETECTOR}/build
 pushd ${JUGGLER_DETECTOR}/build
 cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/ecal/emcal_pi0s.sh b/ecal/emcal_pi0s.sh
index 60ef1a1b65e79403945fa5a7c11ca3389714fba2..fee51297cf5f9b14b8e0322f0777836b21b2570c 100644
--- a/ecal/emcal_pi0s.sh
+++ b/ecal/emcal_pi0s.sh
@@ -22,8 +22,13 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 #git clone https://eicweb.phy.anl.gov/EIC/datasets.git datasets
 root -b -q "ecal/scripts/emcal_pi0.cxx(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
 root -b -q "ecal/scripts/emcal_pi0_reader.cxx(\"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
+
 # Detector TOPSiDE
 git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
 mkdir ${JUGGLER_DETECTOR}/build
 pushd ${JUGGLER_DETECTOR}/build
 cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/rich/rich_config.yml b/rich/rich_config.yml
index 4fc4c3952bad80abbe75b5c2ba8ea3c463397fcb..85a7a27b69a8ab12d5dbdd27d9309b75c6c17080 100644
--- a/rich/rich_config.yml
+++ b/rich/rich_config.yml
@@ -2,7 +2,7 @@ rich_job_x:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
   tags:
     - silicon
-  needs: ["get_data"]
+  needs: ["configure"]
   timeout: 24 hours
   artifacts:
     expire_in: 20 weeks
diff --git a/tracking/central_electrons.sh b/tracking/central_electrons.sh
index 0593a2a6e3c52c2811c897eadbe10d505b896add..2aa4eeb7a908c9671f3610f9f2a7e232155eaee7 100644
--- a/tracking/central_electrons.sh
+++ b/tracking/central_electrons.sh
@@ -24,6 +24,10 @@ echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 ### Build the detector constructors.
 git clone https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
+git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
+pushd ${JUGGLER_DETECTOR}
+ln -s ../accelerator/eic
+popd
 mkdir ${JUGGLER_DETECTOR}/build
 pushd ${JUGGLER_DETECTOR}/build
 cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j30 install
diff --git a/tracking/tracking_config.yml b/tracking/tracking_config.yml
index b139788fa7c7816e633d2645e50dce82827b2fcd..7e929ece4c094b198514d965f1d5307ba7af17a9 100644
--- a/tracking/tracking_config.yml
+++ b/tracking/tracking_config.yml
@@ -2,7 +2,7 @@ tracking_central_electrons:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
   tags:
     - silicon
-  needs: ["get_data"]
+  needs: ["configure"]
   timeout: 24 hours
   artifacts:
     expire_in: 20 weeks