diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0c2c53874fdccdae56348a4b6a97e85475cd7e1..98c022e6e9c4257a0b379f470fcfbc96a46111f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ variables:
     FAKEHOME: "/scratch/$(id -un)"
     COMMAND_OPTIONS_SBATCH: ${slurm_options}
     STACK_VERSION: $(jq -Mrc .stack.version ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
-    image_name: "${stack}-${environment}-${SQUASHFS_ID}"
+    image_name: "${stack}-${environment}-${SQUASHFS_ID}-${CI_PIPELINE_ID}"
     squashfs_image: $(ls -t1 ${CI_DATA_LT}/squashfs-cache/${image_name}*.sqfs 2> /dev/null | head -1)
     APPTAINER_EXEC_OPTIONS: >-
       ${apptainer_options}
diff --git a/ci/update_squashfs.sh b/ci/update_squashfs.sh
index 66e962e1205abacb0a779232368687368f591073..7c63d4dfe7b3f2d6951e7c1405df3335ea979d24 100755
--- a/ci/update_squashfs.sh
+++ b/ci/update_squashfs.sh
@@ -8,6 +8,6 @@ source ${CI_PROJECT_DIR}/ci/stack_env.sh
 
 cd /squashfs-cache
 
-mksquashfs ${STACK_LOCATION} ${stack}-${environment}-${squash_id}-$(date +'%Y%m%d_%H%M').sqfs
+mksquashfs ${STACK_LOCATION} ${stack}-${environment}-${squash_id}-${CI_PIPELINE_ID}-$(date +'%Y%m%d_%H%M').sqfs
 
 #ln -sf ${stack}-${environment}-${squash_id}-$(date +'%Y%m%d_%H%M').sqfs ${stack}-${environment}-${squash_id}.sqfs