diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 2ce3bfdc278..0b053bdeacf 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -22,6 +22,7 @@ env:
   CCACHE_MAXSIZE: 1.25G
   CCACHE_KEY_SUFFIX: r1
   ACTS_LOG_FAILURE_THRESHOLD: WARNING
+  DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
 
 # NOTE this only builds core unittests to reduce the output size. if we
 #      found a way to have Github actions not fail regularly with this job
@@ -29,11 +30,14 @@ env:
 jobs:
   build_debug:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     steps:
 
       - uses: actions/checkout@v4
 
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Cache build
         uses: actions/cache@v4
         with:
@@ -49,6 +53,7 @@ jobs:
           --preset=github-ci
           -DCMAKE_BUILD_TYPE=Debug
           -DCMAKE_CXX_FLAGS="-Werror --coverage -g -gz -g1"
+          -DPython_EXECUTABLE=$(which python3)
           -DACTS_BUILD_ODD=OFF
       - name: Build
         run: cmake --build build
@@ -86,10 +91,14 @@ jobs:
 
   build_performance:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Install dependencies
         run: pip3 install git+https://github.com/paulgessinger/cmakeperf.git@2a409b5
       - name: Configure
@@ -98,6 +107,7 @@ jobs:
           --preset=github-ci
           -DCMAKE_BUILD_TYPE=RelWithDebInfo
           -DCMAKE_CXX_FLAGS="-Werror"
+          -DPython_EXECUTABLE=$(which python3)
           -DACTS_BUILD_ODD=OFF
       - name: Measure
         run: cmakeperf collect build/compile_commands.json -o perf.csv
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 06312a6b339..8a1fc4b0c76 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -24,19 +24,21 @@ env:
 jobs:
   linux_ubuntu:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-    steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
 
+    steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Restore ccache
         uses: actions/cache/restore@v4
         id: ccache-restore
@@ -58,6 +60,7 @@ jobs:
           cmake -B build -S .
           --preset=github-ci
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+          -DPython_EXECUTABLE=$(which python3)
           -DACTS_BUILD_PLUGIN_ONNX=ON
 
       - name: Build
@@ -82,7 +85,6 @@ jobs:
       - name: Install
         run: cmake --build build --target install
 
-
       - name: Package build
         run: tar czf build.tar.gz -C build --exclude "*.o" --exclude "bin/ActsUnitTest*" --exclude "bin/ActsIntegrationTest*" .
 
@@ -108,20 +110,21 @@ jobs:
 
   linux_examples_test:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
 
     steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs
-
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - uses: actions/download-artifact@v4
         with:
           name: acts-linux-ubuntu
@@ -136,29 +139,31 @@ jobs:
           PYTEST_MD_REPORT_VERBOSE: 0
           PYTEST_MD_REPORT_OUTPUT: pytest.md
         run: >
-          /usr/local/bin/geant4-config --install-datasets
+          geant4-config --install-datasets
           && source build/this_acts_withdeps.sh
-          && pip3 install -r Examples/Python/tests/requirements.txt
-          && pip3 install pytest-md-report
+          && python3 -m pip install -r Examples/Python/tests/requirements.txt
+          && python3 -m pip install pytest-md-report
           && pytest -rFsv -k "not exatrkx" -v
           && cat ${PYTEST_MD_REPORT_OUTPUT} >> $GITHUB_STEP_SUMMARY
 
   linux_physmon:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
 
     steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs time
-
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - run: apt-get update && apt-get install -y time
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - uses: actions/download-artifact@v4
         with:
           name: acts-linux-ubuntu
@@ -178,10 +183,15 @@ jobs:
         run: >
           echo "::group::Dependencies"
           && git config --global safe.directory "$GITHUB_WORKSPACE"
-          && pip3 install histcmp==0.6.7 matplotlib
-          && pip3 install -r Examples/Scripts/requirements.txt
-          && /usr/local/bin/geant4-config --install-datasets
+          && python3 -m pip install histcmp==0.6.8 matplotlib
+          && python3 -m pip install -r Examples/Scripts/requirements.txt
+          && geant4-config --install-datasets
+          && venv_python=$(which python3)
+          && echo $venv_python
           && source build/this_acts_withdeps.sh
+          && export PATH=$(dirname $venv_python):$PATH
+          && echo $PATH
+          && which python3
           && echo "::endgroup::"
           && CI/physmon/phys_perf_mon.sh all physmon
 
@@ -232,19 +242,20 @@ jobs:
             std: 20
           - image: ubuntu2204_clang
             std: 20
-    container: ghcr.io/acts-project/${{ matrix.image }}:58
+    container: ghcr.io/acts-project/${{ matrix.image }}:63
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.v4.tar.zst
     steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs
-
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Restore ccache
         uses: actions/cache/restore@v4
         id: ccache-restore
@@ -265,6 +276,7 @@ jobs:
           --preset=github-ci
           -DCMAKE_CXX_STANDARD=${{ matrix.std }}
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+          -DPython_EXECUTABLE=$(which python3)
 
       - name: Build
         run: cmake --build build
@@ -307,11 +319,8 @@ jobs:
     runs-on: macos-14
     env:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
-      DEPENDENCY_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macos-14/deps.v2.tar.zst
-      # Works around an issue where root's RPATH is wrong for tbb, thus won't find it
-      DYLD_LIBRARY_PATH: "${{ github.workspace }}/install/tbb/2021.11.0/lib"
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macos-14/deps.v4.tar.zst
     steps:
       - uses: actions/checkout@v4
         with:
@@ -324,11 +333,7 @@ jobs:
       - name: Install dependencies
         run: >
           brew install cmake ninja ccache xerces-c
-          && wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.zst ${{ env.DEPENDENCY_URL }}
-          && mkdir ${{ env.DEPENDENCY_DIR }}
-          && tar -xf deps.tar.zst -C ${{ env.DEPENDENCY_DIR }}
-          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
-          && python3 -m pip install pyyaml jinja2
+          && CI/dependencies.sh
 
       - name: Restore ccache
         uses: actions/cache/restore@v4
@@ -342,43 +347,51 @@ jobs:
       - name: Configure
         run: >
           ccache -z
-          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
           && cmake -B build -S .
           --preset=github-ci
           -DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
-          -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
           -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
+          -DPython_EXECUTABLE=$(which python3)
+
       - name: Build
         run: cmake --build build
+
       - name: ccache stats
         run: ccache -s
+
       - name: Save ccache
         uses: actions/cache/save@v4
         if: always()
         with:
           path: ${{ github.workspace }}/ccache
           key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
+
       - name: Unit tests
         run: cmake --build build --target test
+
       - name: Integration tests
         run: cmake --build build --target integrationtests
+
       - name: Install
         run: cmake --build build --target install
+
       - uses: actions/upload-artifact@v4
         with:
           name: acts-macos
           path: ${{ env.INSTALL_DIR }}
+
       - name: Downstream configure
         run: >
-          PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
-          && cmake -B build-downstream -S Tests/DownstreamProject
+          cmake -B build-downstream -S Tests/DownstreamProject
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
           -DCMAKE_CXX_FLAGS=-Werror
           -DCMAKE_CXX_STANDARD=20
           -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
+
       - name: Downstream build
         run: cmake --build build-downstream
+
       - name: Downstream run
         run: >
           PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e6b5f42fa9..c34eb4a1f02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,11 @@ variables:
   CCACHE_KEY_SUFFIX: r1
   CTEST_OUTPUT_ON_FAILURE: 1
 
+  DEPENDENCY_TAG: v4
+
 clang_tidy:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
   tags:
     - large
   artifacts:
@@ -14,6 +16,8 @@ clang_tidy:
       - src/clang-tidy/
     when: always
     expire_in: 1 week
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   script:
     - git clone $CLONE_URL src
     - cd src
@@ -24,11 +28,15 @@ clang_tidy:
         && ln -sf /usr/bin/clang++-18 /usr/bin/clang++
         && ln -sf /usr/bin/clang-18 /usr/bin/clang
         && ln -sf /usr/bin/clang-tidy-18 /usr/bin/clang-tidy
+
+    - source CI/dependencies.sh
+
     - >
         cmake -B build -S .
         --preset=gitlab-ci-clangtidy
         -DCMAKE_CXX_COMPILER=clang++
         -DCMAKE_C_COMPILER=clang
+        -DPython_EXECUTABLE=$(which python3)
         -DACTS_RUN_CLANG_TIDY=ON
         -DACTS_BUILD_ODD=OFF
 
@@ -36,7 +44,7 @@ clang_tidy:
     - CI/clang_tidy/run_clang_tidy.sh clang-tidy build
 
     # Install dependencies for processing scripts
-    - pip install -r CI/clang_tidy/requirements.txt
+    - python3 -m pip install -r CI/clang_tidy/requirements.txt
 
     # Parse the main clang-tidy run
     - >
@@ -55,7 +63,9 @@ clang_tidy:
 
 build_exatrkx_cpu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
     - large
 
@@ -72,12 +82,14 @@ build_exatrkx_cpu:
     - git clone $CLONE_URL src
     - cd src
     - git checkout $HEAD_SHA
+    - source CI/dependencies.sh
     - cd ..
     - mkdir build
     # Here we only do a minimal build without examples to save resources
     - >
       cmake -B build -S src
       --preset=gitlab-ci-exatrkx
+      -DPython_EXECUTABLE=$(which python3)
       -DACTS_EXATRKX_ENABLE_CUDA=OFF
 
     - ccache -z
@@ -86,7 +98,9 @@ build_exatrkx_cpu:
 
 build_exatrkx:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
     - large
 
@@ -111,11 +125,13 @@ build_exatrkx:
     - git clone $CLONE_URL src
     - cd src
     - git checkout $HEAD_SHA
+    - source CI/dependencies.sh
     - cd ..
     - mkdir build
     - >
       cmake -B build -S src
       --preset=gitlab-ci-exatrkx
+      -DPython_EXECUTABLE=$(which python3)
       -DCMAKE_CUDA_ARCHITECTURES="75;86"
 
     - ccache -z
@@ -126,7 +142,7 @@ build_exatrkx:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -136,7 +152,7 @@ build_exatrkx:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -152,7 +168,9 @@ build_exatrkx:
 
 build_linux_ubuntu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
 
   cache:
     key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
@@ -177,12 +195,14 @@ build_linux_ubuntu:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
 
     - cd ..
     - mkdir build
     - >
       cmake -B build -S src
       --preset=gitlab-ci
+      -DPython_EXECUTABLE=$(which python3)
       -DACTS_BUILD_PLUGIN_ONNX=ON
 
     - ccache -z
@@ -191,7 +211,9 @@ build_linux_ubuntu:
 
 linux_test_examples:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   needs: [build_linux_ubuntu]
 
   script:
@@ -202,17 +224,20 @@ linux_test_examples:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
     - cd ..
 
-    - /usr/local/bin/geant4-config --install-datasets
+    - geant4-config --install-datasets
     - source build/this_acts_withdeps.sh
     - cd src
-    - pip3 install -r Examples/Python/tests/requirements.txt
+    - python3 -m pip install -r Examples/Python/tests/requirements.txt
     - pytest -rFsv -k "not exatrkx" -v -s
 
 linux_physmon:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   needs: [build_linux_ubuntu]
 
   artifacts:
@@ -229,13 +254,19 @@ linux_physmon:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
     - cd ..
 
     - git config --global safe.directory "$GITHUB_WORKSPACE"
-    - pip3 install histcmp==0.6.7 matplotlib
-    - pip3 install -r src/Examples/Scripts/requirements.txt
-    - /usr/local/bin/geant4-config --install-datasets
+    - python3 -m pip install histcmp==0.6.8 matplotlib
+    - python3 -m pip install -r src/Examples/Scripts/requirements.txt
+    - geant4-config --install-datasets
+    - venv_python=$(which python3)
+    - echo $venv_python
     - source build/this_acts_withdeps.sh
+    - export PATH=$(dirname $venv_python):$PATH
+    - echo $PATH
+    - which python3
     - cd src
     - CI/physmon/phys_perf_mon.sh all physmon
 
@@ -243,7 +274,7 @@ linux_physmon:
 ### UBUNTU EXTRA JOB MATRIX ###
 ###############################
 
-.linux_ubuntu_extra: &linux_ubuntu_extra
+.linux_ubuntu_extra:
   variables:
     INSTALL_DIR: ${CI_PROJECT_DIR}/install
 
@@ -262,12 +293,14 @@ linux_physmon:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
 
     - cd ..
     - mkdir build
     - >
       cmake -B build -S src
       --preset=gitlab-ci
+      -DPython_EXECUTABLE=$(which python3)
       -DCMAKE_CXX_STANDARD=${CXXSTD}
 
     - ccache -z
@@ -295,25 +328,27 @@ linux_physmon:
     # Downstream run
     - ./build-downstream/bin/ShowActsVersion
 
-linux_ubuntu_2404:
-  <<: *linux_ubuntu_extra
+linux_ubuntu_2204:
+  extends: .linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2404:58
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
+  image: ghcr.io/acts-project/ubuntu2204:63
 
 linux_ubuntu_2204_clang:
-  <<: *linux_ubuntu_extra
+  extends: .linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2204_clang:58
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
+  image: ghcr.io/acts-project/ubuntu2204_clang:63
 
 
 ######################
 ### LCG JOB MATRIX ###
 ######################
 
-.lcg: &lcg_base_job
-  image: ghcr.io/acts-project/${OS}-base:58
+.lcg_base_job:
+  image: ghcr.io/acts-project/${OS}-base:63
   stage: build
   tags:
     - cvmfs
@@ -364,6 +399,7 @@ linux_ubuntu_2204_clang:
       cmake -B build -S src
       --preset=gitlab-ci
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+      -DPython_EXECUTABLE=$(which python3)
       -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point
 
     - ccache -z
@@ -374,7 +410,7 @@ linux_ubuntu_2204_clang:
 
 
 lcg_105:
-  <<: *lcg_base_job
+  extends: .lcg_base_job
 
   variables:
     LCG_VERSION: "105"
diff --git a/CI/dependencies.sh b/CI/dependencies.sh
new file mode 100755
index 00000000000..7c8879b499e
--- /dev/null
+++ b/CI/dependencies.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+function run() {
+    set -x
+    "$@"
+    { set +x;  } 2> /dev/null
+}
+
+function set_env {
+  key="$1"
+  value="$2"
+
+  echo "=> ${key}=${value}"
+
+  if [ -n "${GITHUB_ACTIONS:-}" ]; then
+    echo "${key}=${value}" >> $GITHUB_ENV
+  else
+    export ${key}=${value}
+  fi
+}
+
+url=${1:-${DEPENDENCY_URL:-}}
+
+if [ -n "${GITHUB_ACTIONS:-}" ]; then
+    destination="${GITHUB_WORKSPACE}/dependencies"
+elif [ -n "${GITLAB_CI:-}" ];then
+    destination="${CI_PROJECT_DIR}/dependencies"
+else
+    destination=${2}
+fi
+
+set_env DEPENDENCY_DIR "${destination}"
+
+if [ -z "${url}" ]; then
+    echo "url is not set"
+    exit 1
+fi
+
+echo "URL: $url"
+echo "DESTINATION: $destination"
+
+# check curl location
+CURL=$(command -v curl)
+if [ -z "$CURL" ]; then
+    echo "curl is not available"
+    exit 1
+fi
+
+UNZSTD=$(command -v unzstd)
+if [ -z "$UNZSTD" ]; then
+    echo "unzstd is not available"
+    exit 1
+fi
+
+TAR=$(command -v tar)
+if [ -z "$TAR" ]; then
+    echo "tar is not available"
+    exit 1
+fi
+
+run mkdir -p "${destination}"
+
+run $CURL \
+  --retry 5 \
+  --connect-timeout 2 \
+  --location $url \
+  | unzstd \
+  | tar \
+    -x \
+    --strip-components=1 \
+    --directory "${destination}"
+
+# Patch up geant4-config data install script
+out=$(${destination}/bin/geant4-config --datasets)
+line=$(echo "$out" | head -n1)
+orig_share=$(echo "$line" | perl -pe 's|.*?(\/.*)\/share.*|\1|')
+orig_share_escaped=$(echo $orig_share|perl -pe 's|/|\\/|g')
+destination_escaped=$(echo "$destination"|perl -pe 's|/|\\/|g')
+perl -pi.bak -e "s/$orig_share_escaped/$destination_escaped/g" ${destination}/bin/geant4-config
+
+if [ -n "${GITHUB_ACTIONS:-}" ]; then
+  echo "Running in GitHub Actions"
+  venv="${GITHUB_WORKSPACE}/venv"
+fi
+
+if [ -n "${GITLAB_CI:-}" ];then
+  echo "Running in GitLab CI"
+  venv="${CI_PROJECT_DIR}/venv"
+fi
+
+if [ -n "${CI:-}" ];then
+  run "${destination}/bin/python3" -m venv "${venv}"
+  run "${venv}/bin/python3" -m pip install pyyaml jinja2
+  set_env PATH "${venv}/bin:${destination}/bin/:${PATH}"
+fi
+
+set_env CMAKE_PREFIX_PATH "${destination}"
+set_env LD_LIBRARY_PATH "${destination}/lib"
+set_env ROOT_INCLUDE_PATH "${destination}/include"
+# Geant4 puts CLHEP in a subdirectory
+set_env ROOT_INCLUDE_PATH "${destination}/include/Geant4"
+# Pythia8 looks for settings in this directory
+set_env PYTHIA8DATA "${destination}/share/Pythia8/xmldoc"
diff --git a/CI/physmon/phys_perf_mon.sh b/CI/physmon/phys_perf_mon.sh
index c711ed538d3..c2944f0dd06 100755
--- a/CI/physmon/phys_perf_mon.sh
+++ b/CI/physmon/phys_perf_mon.sh
@@ -15,7 +15,7 @@ function run() {
 
 export run
 
-
+run which python3
 shopt -s extglob
 
 
@@ -238,6 +238,7 @@ function trackfinding() {
         $path/performance_fitting_ckf_plots \
         --config $default_config
 
+
     run Examples/Scripts/generic_plotter.py \
         $outdir/data/$path/tracksummary_ckf.root \
         tracksummary \
diff --git a/CI/physmon/reference/simulation/particles_ttbar_hist.root b/CI/physmon/reference/simulation/particles_ttbar_hist.root
index 9100c71418a..4b8b8c552e0 100644
Binary files a/CI/physmon/reference/simulation/particles_ttbar_hist.root and b/CI/physmon/reference/simulation/particles_ttbar_hist.root differ
diff --git a/CI/physmon/reference/simulation/vertices_ttbar_hist.root b/CI/physmon/reference/simulation/vertices_ttbar_hist.root
index 9e54eaed90e..7dc8182b96a 100644
Binary files a/CI/physmon/reference/simulation/vertices_ttbar_hist.root and b/CI/physmon/reference/simulation/vertices_ttbar_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root
index 2c7626e0516..780bcb52424 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root
index c5d08a93db0..e3c280303bf 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root
index fbe539546d0..be682507eb2 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root
index 5e072e1393c..59b65288d0a 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root
index 64abc1fadaf..8d1bf337631 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root
index 8181f0608c4..25110c369be 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root
index e964b96fcab..f803f21ee8f 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root differ
diff --git a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root
index 3d2eaa11044..e88989022ad 100644
Binary files a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root differ
diff --git a/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root
index aade25ba5a2..2fe268e872a 100644
Binary files a/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root differ
diff --git a/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root
index d888ad406d8..300b14d54aa 100644
Binary files a/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root and b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root differ
diff --git a/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root
index aade25ba5a2..860b6da66ff 100644
Binary files a/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root and b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8e9ab3f583..f81002cab83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,7 @@ endif()
 set(_acts_actsvg_version 0.4.50)
 set(_acts_boost_version 1.71.0)
 set(_acts_dd4hep_version 1.21)
+set(_acts_geant4_version 11.1.3)
 set(_acts_edm4hep_version 0.7)
 set(_acts_eigen3_version 3.4.0)
 set(_acts_podio_version 1.0.1) # will try this first
@@ -453,7 +454,7 @@ if(ACTS_BUILD_PLUGIN_EDM4HEP)
     find_package(EDM4HEP ${_acts_edm4hep_version} REQUIRED CONFIG)
 endif()
 if(ACTS_BUILD_PLUGIN_GEANT4)
-    find_package(Geant4 REQUIRED CONFIG COMPONENTS gdml)
+    find_package(Geant4 ${_acts_geant4_version} REQUIRED CONFIG COMPONENTS gdml)
 endif()
 
 if(ACTS_BUILD_PLUGIN_TRACCC)
diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt
index b56415c0c05..035781c3d0a 100644
--- a/Examples/Python/tests/root_file_hashes.txt
+++ b/Examples/Python/tests/root_file_hashes.txt
@@ -1,13 +1,13 @@
-test_pythia8__pythia8_particles.root: a8b53c12e771091bc2f5ace0198e9f6c5ac1909e2e6d0e3e4945e8174048ef62
+test_pythia8__pythia8_particles.root: 91c852f3e0e20bcd382c616a7b643985d092decd42bdd653deae67ed8652e8d8
 test_fatras__particles_simulation.root: bc970873fef0c2efd86ed5413623802353d2cd04abea72de14e8cdfc0e40076f
 test_fatras__hits.root: 6e4beb045fa1712c4d14c280ba33c3fa13e4aff9de88d55c3e32f62ad226f724
-test_geant4__particles_simulation.root: 3c9c6265183b04c9d62ed5f2d0709c6dd74e33fbb53ac0aeb3274f6600257fc1
-test_geant4__hits.root: adf5dcdf000a580412dc5089e17460897d6535c978eafa021584ba4281d0a1ac
+test_geant4__particles_simulation.root: 49926c71a9b54e13aa1cc7596d3302baf3c87d8e2c1d0267cb4523f6abdc0ac2
+test_geant4__hits.root: 4c9e704a75f47ed2e61652679a1d6f18fa4d9cf53faa8f8f5bbf7995634207aa
 test_seeding__estimatedparams.root: 69c0e268f9025a0991a212ea2a7f26f53112fecf614b475605bd1cb08415ba56
 test_seeding__performance_seeding.root: 992f9c611d30dde0d3f3ab676bab19ada61ab6a4442828e27b65ec5e5b7a2880
 test_seeding__particles.root: 7855b021f39ad238bca098e4282667be0666f2d1630e5bcb9d51d3b5ee39fa14
 test_seeding__particles_simulation.root: f937a4cc474e80cfbb6eac4384e42e9c5c7ac981fcd6870d624cc898d1a0c006
-test_hashing_seeding__estimatedparams.root: 1f43b760e80089b5674e106d00d962d74be564cbf33ae38222052ebb6f9cbf3a
+test_hashing_seeding__estimatedparams.root: 1ab38fbedeaff1380fc022e2970e6c74163d770613205100bd34c3e88283e387
 test_seeding_orthogonal__estimatedparams.root: ca5896ec325daf5c8012291bc454269c61c32fe3d7e33bd1fa3b812826930299
 test_seeding_orthogonal__performance_seeding.root: 60fbedcf5cb2b37cd8e526251940564432890d3a159d231ed819e915a904682c
 test_seeding_orthogonal__particles.root: 7855b021f39ad238bca098e4282667be0666f2d1630e5bcb9d51d3b5ee39fa14