diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 659e863530229aff48c514d400a02ab3a64cb635..39e10c8f5154d0fe176aa27428e54ea620421139 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ workflow:
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_TAG =~ /^v[0-9].*$/
 
 variables:
   TERM: ansi
@@ -213,9 +214,10 @@ spack:mksquashfs:
     #- .spack_cache
   script:
     - source ci/stack_env.sh
-    - mksquashfs ${STACK_LOCATION} ${stack}-${environment}-${SQUASHFS_ID}.sqfs
-
+    - mkfir -p /squashfs-cache/releases/
+    - mksquashfs ${STACK_LOCATION} /squashfs-cache/releases/${stack}-${environment}-${SQUASHFS_ID}-${CI_COMMIT_TAG}.sqfs
   needs:
     - job: spack:install
-  #ressource_group: mksquashfs
   timeout: 1h
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /v[0-9]+.*/