diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72d401e2b1a079b494c25629cd280685614610b8..534762a6a56362353e9afebde08663520161ae88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,19 +16,13 @@ workflow:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 variables:
-  BUILDCACHE: "/work/scitas-ge/richart/buildcache"
-  SPACK_PATH: "/work/scitas-ge/richart/ci_cache/spack/${CI_JOB_ID}"
-  STACK_PATH: "/work/scitas-ge/richart/ci_cache/stack/${CI_JOB_ID}"
-  SPACK_DISABLE_LOCAL_CONFIG: "true"
-  SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}"
-  SPACK_SITE_CONFIG_PATH: "/stack/spack/etc"
 # ------------------------------------------------------------------------------
 .parallel_job:
   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"]
       # - environment: [izar]
@@ -40,6 +34,12 @@ variables:
   variables:
     COMMAND_OPTIONS_SBATCH: ${slurm_options}
     APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw --bind ${SPACK_PATH}:/spack:rw --bind ${STACK_PATH}:/stack:rw --writable-tmpfs
+    SPACK_DISABLE_LOCAL_CONFIG: "true"
+    SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}"
+    SPACK_SITE_CONFIG_PATH: "/stack/spack/etc"
+    BUILDCACHE: "/work/scitas-ge/richart/buildcache"
+    SPACK_PATH: "/work/scitas-ge/richart/ci_cache/spack/${environment}"
+    STACK_PATH: "/work/scitas-ge/richart/ci_cache/stack/${environment}"
 
 # ------------------------------------------------------------------------------
 spack:setup:
diff --git a/spack.yaml b/spack.yaml
index 380a36ab7c505b8e0a924dd1d1bf669c4c4b36dd..d465981341e7bd6e968d65d9603445b1ab88097f 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -9,6 +9,9 @@ spack:
     - when: env['environment'] == 'helvetios'
       serial_codes_per_cluster:
         - ucx +rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple +verbs ~cuda ~gdrcopy
+    - when: env['environment'] == 'jed'
+      serial_codes_per_cluster:
+        - ucx +rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple +verbs ~cuda ~gdrcopy
     - when: env['environment'] == 'izar'
       serial_codes_per_cluster:
         - ucx +rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple +verbs +cuda cuda_arch=70 +gdrcopy
@@ -19,6 +22,9 @@ spack:
     - when: env['environment'] == 'helvetios'
       mpis:
         - openmpi fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +gpfs
+    - when: env['environment'] == 'jed'
+      mpis:
+        - openmpi fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +gpfs
     - when: env['environment'] == 'izar'
       mpis:
         - openmpi fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +gpfs +cuda cuda_arch=70