diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 534762a6a56362353e9afebde08663520161ae88..1358f41cfe3484b17c3e911771b3adbeac4dc9b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,9 +37,9 @@ variables:
     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}"
+    BUILDCACHE: "/work/scitas-ge/richart/ci/buildcache"
+    SPACK_PATH: "/work/scitas-ge/richart/ci/${environment}/spack"
+    STACK_PATH: "/work/scitas-ge/richart/ci/${environment}/stack"
 
 # ------------------------------------------------------------------------------
 spack:setup: