diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 619d6554909ac2a8e55a1f93f9b45adc6de583a5..43d5998a0e263f208b723e0be4db882289a53ace 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ variables:
       then
         exit 0
       fi
-    - ./ci/update_squashfs.sh
+    - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
 
 .spack_cache:
   cache:
diff --git a/ci/fuse-overlayfs.sh b/ci/fuse-overlayfs.sh
index d6db3163d95e44b52423d93267b7184d7c7cad92..f9723f0241b537862e55e1d1809b045e69190bc5 100755
--- a/ci/fuse-overlayfs.sh
+++ b/ci/fuse-overlayfs.sh
@@ -4,7 +4,14 @@ CI_DATA=$1
 suffix=$2
 mount_point=$3
 
-mkdir -p ${CI_DATA}/overlayfs/{upper,wd}-${suffix}
+for i in upper wd
+do
+    if [ -d ${CI_DATA}/overlayfs/$i-${suffix} ]
+    then
+        rm -rf ${CI_DATA}/overlayfs/$i-${suffix}
+    fi
+    mkdir -p ${CI_DATA}/overlayfs/$i-${suffix}
+done
 
 /usr/libexec/apptainer/bin/fuse-overlayfs \
     -o squash_to_uid=$(id -u) \
diff --git a/ci/prepare_squashfs.sh b/ci/prepare_squashfs.sh
index 27465a15a77ce740c5efbee61f288db295f24fcb..178c2a889e7f64a62a98fe0c91dad1232657dcd7 100755
--- a/ci/prepare_squashfs.sh
+++ b/ci/prepare_squashfs.sh
@@ -5,6 +5,15 @@ set -o nounset
 
 source ${CI_PROJECT_DIR}/ci/stack_env.sh
 
+for i in overlayfs squashfs-cache buildcache spack-mirror
+do
+    if [ ! -e ${CI_DATA}/$i ]
+    then
+        mkdir -p ${CI_DATA}/$i
+    fi
+done
+
+
 # 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 ]