diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f4b1b5236b4ce7c4b5a353b6debcc14968aca9c..5eb3687128dae88291b81c7b3e6cbe2c0a6788e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,13 +32,6 @@ common:setup:
   before_script:
     - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup 
   script:
-    - |
-      if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event"  || "$CI_COMMIT_BRANCH" == "master" ]]; then
-        echo "JUGGLER_DETECTOR         = ${JUGGLER_DETECTOR}"
-        echo "JUGGLER_DETECTOR_VERSION = ${CI_COMMIT_REF_NAME}"
-        echo "JUGGLER_DETECTOR_VERSION=$CI_COMMIT_REF_NAME" >> juggler.env
-        echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
-      fi
     - source setup/bin/env.sh && ./setup/bin/install_common.sh
 
 common:detector:
@@ -51,6 +44,17 @@ common:detector:
     - mkdir -p config
     - print_env.sh
 
+.rec_benchmark:
+  image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
+  needs:
+    - ["common:detector"]
+  before_script:
+    - source .local/bin/env.sh
+    - ls -lrtha 
+    - ln -s "${LOCAL_DATA_PATH}/sim_output" sim_output
+    - ln -s "${LOCAL_DATA_PATH}/datasets/data" data
+    - ls -lrtha
+
 include: 
   - local: 'benchmarks/ecal/config.yml'
   - local: 'benchmarks/tracking/config.yml'
diff --git a/benchmarks/tracking/central_electrons.sh b/benchmarks/tracking/central_electrons.sh
index 77f77bd49fbf53d88cf8420fd82328f513f99ce2..c941a9da8c6af7ceae91f3acf0826d3dcce5fafd 100644
--- a/benchmarks/tracking/central_electrons.sh
+++ b/benchmarks/tracking/central_electrons.sh
@@ -39,7 +39,7 @@ done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
 
-./util/print_env.sh
+print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
@@ -49,7 +49,6 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
 ## and how they can be controlled.
-source options/env.sh
 export JUGGLER_DETECTOR_PATH=${DETECTOR_PATH}
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -77,6 +76,7 @@ then
     exit 1
   fi
 
+  echo "Running geant4 simulation"
   ## run geant4 simulations
   npsim --runType batch \
     --part.minimalKineticEnergy 1000*GeV  \
diff --git a/benchmarks/tracking/config.yml b/benchmarks/tracking/config.yml
index 0d63dc390a6472c4738fe891e4e8f7dd1c604e28..671826a085e024f4f3e7b913173270c685a8ea82 100644
--- a/benchmarks/tracking/config.yml
+++ b/benchmarks/tracking/config.yml
@@ -1,12 +1,7 @@
 tracking_central_electrons:
-  image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
-  needs: ["common:detector"]
-  timeout: 24 hours
-  artifacts:
-    expire_in: 20 weeks
-    paths:
-      - results/
+  extends: .rec_benchmark
   stage: run
+  timeout: 24 hours
   script:
     - bash benchmarks/tracking/central_electrons.sh