diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38edba6095acf9103a5bcf360c8a336ce9420e78..79dff3cb2cbf8a0d7a3e704675510136d323343b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,6 +65,7 @@ common:detector:
 include: 
   - local: 'benchmarks/ecal/config.yml'
   - local: 'benchmarks/track_finding/config.yml'
+  - local: 'benchmarks/track_fitting/config.yml'
   - local: 'benchmarks/tracking/config.yml'
   - local: 'benchmarks/clustering/config.yml'
     #  - local: 'benchmarks/rich/config.yml'
@@ -75,7 +76,7 @@ include:
 
 final_report:
   stage: finish
-  needs: ["ecal_collect", "tracking_central_electrons", "clustering:results", "full:results"]
+  needs: ["ecal_collect", "tracking_central_electrons", "clustering:results", "full:results","track_finding:collect","track_fitting:collect"]
   script:
     # disabled while we address ACTS issues
     #- mkdir -p results/views && cd results/views && bash ../../bin/download_views
diff --git a/benchmarks/track_finding/config.yml b/benchmarks/track_finding/config.yml
index 5453eab2c34ce336e278548a25ac76cd7d6cab9e..a5c029010a2e7f8cf64b8070c4a5db07ad463e80 100644
--- a/benchmarks/track_finding/config.yml
+++ b/benchmarks/track_finding/config.yml
@@ -4,3 +4,11 @@ track_finding:multiple_tracks:
   timeout: 24 hours
   script:
     - bash benchmarks/track_finding/multiple_tracks.sh
+
+track_finding:collect:
+  stage: collect
+  needs:
+    - ["track_finding:multiple_tracks"]
+  script:
+    - echo "Done collecting artifacts."
+
diff --git a/benchmarks/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh
index 85df9ebcfa1a205ed1e4c77a9899dfcc814fd7ac..0ea376eff6861f1a4d07d83b8be4b236761c8970 100644
--- a/benchmarks/track_finding/multiple_tracks.sh
+++ b/benchmarks/track_finding/multiple_tracks.sh
@@ -80,7 +80,7 @@ rootls -t ${JUGGLER_SIM_FILE}
 if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
-  gaudirun.py benchmarks/tracking/options/track_reconstruction.py
+  xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_finding/options/track_reconstruction.py
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running juggler"
     exit 1
diff --git a/benchmarks/track_fitting/config.yml b/benchmarks/track_fitting/config.yml
index 782f19b1f6378e6ee57d8c3ebc233f2304839b8c..2363c6a73ffe82ebee142bc8b105509914fb8bdb 100644
--- a/benchmarks/track_fitting/config.yml
+++ b/benchmarks/track_fitting/config.yml
@@ -4,4 +4,11 @@ track_fitting:single_tracks:
   script:
     - bash benchmarks/track_fitting/single_tracks.sh
       
+track_fitting:collect:
+  stage: collect
+  needs:
+    - ["track_fitting:single_tracks"]
+  script:
+    - echo "Done collecting artifacts."
+
 
diff --git a/benchmarks/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh
index dc84059cab441157099938197e6486f7e157d65a..e10a71f104fbd18ba2b52dd52b2434d14be7c9e4 100644
--- a/benchmarks/track_fitting/single_tracks.sh
+++ b/benchmarks/track_fitting/single_tracks.sh
@@ -83,7 +83,7 @@ rootls -t ${JUGGLER_SIM_FILE}
 if [[ -z "${ANALYSIS_ONLY}" ]] ;
 then
   # Need to figure out how to pass file name to juggler from the commandline
-  gaudirun.py benchmarks/track_fitting/options/tracker_reconstruction.py
+  xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv gaudirun.py benchmarks/track_fitting/options/track_reconstruction.py
   if [[ "$?" -ne "0" ]] ; then
     echo "ERROR running juggler"
     exit 1