diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d63fefd53f2a1d08a7e1b662cffaf3ce365ec9d..076e2fddb8ad71852dd7860d7a5a8bfe325d4be7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ workflow:
 
 variables:
   TERM: ansi
-  CI_DATA: "/scratch/richart/ci"
+  CI_DATA: "/work/scitas-ge/richart/ci"
 
 .parallel_definition:
   parallel:
@@ -102,14 +102,6 @@ spack:checkout:
   before_script:
     - git config --global --add --bool advice.detachedHead false
   script:
-    # - |
-    #   for i in overlayfs squashfs-cache buildcache spack-mirror
-    #   do
-    #     if [ ! -e ${CI_DATA}/$i ]
-    #     then
-    #       mkdir -p ${CI_DATA}/$i
-    #     fi
-    #   done
     - ./ci/prepare_squashfs.sh
   timeout: 1h
 
diff --git a/ci/prepare_squashfs.sh b/ci/prepare_squashfs.sh
index e25e4595398cac634695b9d2cdb2eed7452df1a4..be78be62ac9b43749e2d8fa5b1174260dd348ab2 100755
--- a/ci/prepare_squashfs.sh
+++ b/ci/prepare_squashfs.sh
@@ -2,7 +2,7 @@
 
 set -o pipefail
 set -o nounset
-
+set -o errexit
 source ${CI_PROJECT_DIR}/ci/stack_env.sh
 
 for i in overlayfs squashfs-cache buildcache spack-mirror
@@ -13,6 +13,8 @@ do
     fi
 done
 
+
+set +o errexit
 # Check if MR as squashfs
 sqfs_image=$(ls -t1 ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}*.sqfs 2> /dev/null | head -1)
 if [ $? -ne 0 ]
@@ -31,6 +33,8 @@ then
         echo "Found ${sqfs_base_image}"
     fi
 
+    set -o errexit
+
     # Link MR sqaushfs to the one of default branch
     sqfs_image=${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs
 
@@ -40,6 +44,7 @@ then
 
     echo "Linking ${sqfs_image} -> ${sqfs_base_image}"
 else
+    set -o errexit
     if [ ${sqfs_image} != ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs ];
     then
         cd ${CI_DATA}/squashfs-cache