diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd72810d1edfd67e5090c630dd6626783e7cb55e..f4958fd63f63485f49dc6291ab56be0855aec091 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -236,7 +236,7 @@ generate-pipeline:
     - git clone https://github.com/${EICSPACK_ORGREPO}.git ${SPACK_ROOT}/var/spack/repos/eic-spack
     - git -C ${SPACK_ROOT}/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
   script:
-    - spack env activate --without-view .
+    - spack -d env activate --without-view .
     - spack -d ci generate
       --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir"
       --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/pipeline.yml"
diff --git a/spack.yaml b/spack.yaml
index 0827b1f787d39bc082cfd826e09e19447d147afa..3eece3b1030b27258abdfed1c6f135da0d7feda7 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -68,22 +68,24 @@ spack:
 
   gitlab-ci:
     before_script:
-      - git clone ${SPACK_REPO} spack
+      - git clone https://github.com/${SPACK_ORGREPO}.git spack
       - git -C spack checkout ${SPACK_VERSION}
       - . "./spack/share/spack/setup-env.sh"
-      - git clone ${EICSPACK_REPO} ${SPACK_ROOT}/var/spack/repos/eic-spack
-      - git -C ${SPACK_ROOT}/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
+      - git clone https://github.com/${EICSPACK_ORGREPO}.git spack/var/spack/repos/eic-spack
+      - git -C spack/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
     script:
       - pushd ${SPACK_CONCRETE_ENV_DIR} && spack env activate --without-view . && popd
       - spack -d ci rebuild
     mappings:
-      - match:
-          - os=ubuntu20.04
+      - match: ["os=ubuntu20.04"]
         runner-attributes:
           image: spack/ubuntu-focal
-      - match:
-          - os=ubuntu22.04
+          tags:
+            - docker-new
+      - match: ["os=ubuntu22.04"]
         runner-attributes:
           image: spack/ubuntu-jammy
+          tags:
+            - docker-new
     enable-artifacts-buildcache: False
     rebuild-index: True