diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48f5ecf470dbb839b334856a5c1e5475597d7a98..f1de336c209e422d5b7730ced3a9bfa57e38b4db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,8 @@ variables:
   image: registry.c4science.ch/scitas-stack/rhel:9.3
   parallel:
     matrix:
-#      - environment: [helvetios]
-#        slurm_options: ["-c 36"]
+      #      - environment: [helvetios]
+      #        slurm_options: ["-c 36"]
       - environment: [jed]
         slurm_options: ["-c 72 -p jed -q jed"]
         stack: ["pinot-noir"]
@@ -39,7 +39,7 @@ variables:
     APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw
     SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}"
     SPACK_USER_CONFIG_PATH: "/tmp/spack_user_${CI_JOB_ID}"
-    SPACK_SYSTEM_CONFIG_PATH: "/stack/spack/etc"
+    SPACK_SYSTEM_CONFIG_PATH: "${CI_PROJECT_DIR}/stack/spack/etc"
     BUILDCACHE: "/work/scitas-ge/richart/ci/buildcache"
 
 .spack_cache:
@@ -49,7 +49,7 @@ variables:
     paths:
       - spack/
       - stack/
-      - compiler_definitions.yaml
+      - stacks/${stack}/compiler_definitions.yaml
 
 # ------------------------------------------------------------------------------
 spack:setup:
@@ -98,11 +98,11 @@ spack:install:
     - .parallel_job
   script:
     - spack/bin/spack -e stacks/${stack} install
-          --log-file spack-install.xml
-          --log-format junit
-          --only-concrete
-          --fail-fast
-          --show-log-on-error
+      --log-file spack-install.xml
+      --log-format junit
+      --only-concrete
+      --fail-fast
+      --show-log-on-error
   needs:
     - job: spack:concretize
   artifacts: