diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45843c77c9c59f316a0504778e9f634a53f74bbd..a5dea33de26d95d46fea4680f2f0167fae881572 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,6 +151,9 @@ spack:concretize:
     - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment}
           concretize | tee concretize-${environment}-${stack}.log
 
+    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment}
+          mirror create -D -d ${MOUNT_POINT}/spack-mirror -a || /usr//bin/true
+
     - cp ${SPACK_SYSTEM_CONFIG_PATH}/spack.lock spack-${environment}-${stack}.lock
     - ${CI_PROJECT_DIR}/ci/update_squashfs.sh
   artifacts:
@@ -171,6 +174,9 @@ spack:install:
     - source ci/stack_env.sh
     - echo "{}" > spack-install-${environment}.xml
 
+    # Cleaning patches in case one has a different hash
+    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment} clean -m
+
     - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment} install
           --log-file spack-install-${environment}.xml
           --log-format junit