diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39e10c8f5154d0fe176aa27428e54ea620421139..95a451f877417ed64e0f6080c647fcee4f403732 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,6 +62,9 @@ variables:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       variables:
         SQUASHFS_ID: ${CI_COMMIT_BRANCH}
+    - if: $CI_COMMIT_TAG =~ /^v[0-9].*$/
+      variables:
+        SQUASHFS_ID: ${CI_COMMIT_BRANCH}
 
 .parallel_job:
   extends:
@@ -174,20 +177,30 @@ spack:install:
     #- .spack_cache
   script:
     - 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}
+          clean -m
 
-    - ${STACK_LOCATION}/spack/bin/spack --color always -e ${environment} install
-          --log-file spack-install-${environment}.xml
+    - ${STACK_LOCATION}/spack/bin/spack
+          --color always
+          -e ${environment} install
+          --log-file ${CI_PROJECT_DIR}/spack-install-${environment}.xml
           --log-format junit
           --only-concrete
           --fail-fast
           --show-log-on-error
 
-    - ${STACK_LOCATION}/spack/bin/spack -e ${environment} find -vl | tee spack-find-${environment}-${stack}.log
-    - ${STACK_LOCATION}/spack/bin/spack -e ${environment}
+    - ${STACK_LOCATION}/spack/bin/spack
+          --color always
+          -e ${environment}
+          find -vl | tee spack-find-${environment}-${stack}.log
+
+    - ${STACK_LOCATION}/spack/bin/spack
+          --color always
+          -e ${environment}
           buildcache create
           --update-index
           --key EDC904DCE3D2E84E
@@ -202,7 +215,8 @@ spack:install:
     - job: spack:concretize
   artifacts:
     paths:
-      - spack-find-*.log
+      - spack-*.log
+      - spack-*.xml
     reports:
       junit: spack-install-*.xml
   timeout: 72h
diff --git a/ci/install_compilers.sh b/ci/install_compilers.sh
index fbfeef455ccdf0d086f757426481a20f2c670f72..a9863839eb75542728d8cc16d91e3d02163ee2ba 100755
--- a/ci/install_compilers.sh
+++ b/ci/install_compilers.sh
@@ -25,14 +25,18 @@ for c in  "core_compilers" "compilers"; do
     echo "${_specs}"
 
     if [ "x${_specs}" != "x" ]; then
-        ${STACK_LOCATION}/spack/bin/spack spec \
+        ${STACK_LOCATION}/spack/bin/spack \
+            --color always \
+            spec \
             --install-status \
             --namespaces \
             --long \
             --types \
             ${_specs}
 
-        ${STACK_LOCATION}/spack/bin/spack spec \
+        ${STACK_LOCATION}/spack/bin/spack \
+            --color always \
+            spec \
             --install-status \
             --namespaces \
             --long \
@@ -40,8 +44,10 @@ for c in  "core_compilers" "compilers"; do
             --json \
             ${_specs} > compilers_spec.json
 
-        ${STACK_LOCATION}/spack/bin/spack install \
-            --log-file ${MOUNT_POINT}/spack-install-${c}.xml \
+        ${STACK_LOCATION}/spack/bin/spack \
+            --color always \
+            install \
+            --log-file ${CI_PROJECT_DIR}/spack-install-${c}.xml \
             --log-format junit \
             --fail-fast \
             --show-log-on-error \
@@ -50,7 +56,9 @@ for c in  "core_compilers" "compilers"; do
         hashes=$(jq -Mr '.spec.nodes | map("/\(.hash)") | join(" ")' compilers_spec.json)
 
         echo "Adding packages to buildcache"
-        ${STACK_LOCATION}/spack/bin/spack buildcache create \
+        ${STACK_LOCATION}/spack/bin/spack \
+            --color always \
+            buildcache create \
             --update-index \
             --key EDC904DCE3D2E84E \
             ${MOUNT_POINT}/buildcache ${hashes}
@@ -63,7 +71,9 @@ for c in  "core_compilers" "compilers"; do
             # echo "  - ${location}/compiler/latest/linux"
             # echo "  - ${location}/Linux_x86_64/2024/compilers"
 
-            ${STACK_LOCATION}/spack/bin/spack compiler find \
+            ${STACK_LOCATION}/spack/bin/spack \
+                --color always \
+                compiler find \
                 --scope system \
                 ${location} \
                 ${location}/compiler/latest \
diff --git a/stacks/pinot-noir/definitions_empty.yaml b/stacks/pinot-noir/definitions_empty.yaml
index ca4ba7fe51ad3279cebc61ff97ee72782db03b81..5449b15f4fe809d6f7dfc6e6c37f4f8d44aa231c 100644
--- a/stacks/pinot-noir/definitions_empty.yaml
+++ b/stacks/pinot-noir/definitions_empty.yaml
@@ -1 +1,9 @@
-definitions: []
+definitions:
+    # -------------------------------------------------------------------------
+    # Empty to specialize in environments
+    # -------------------------------------------------------------------------
+    - cuda_system_codes: []
+
+    - cuda_serial_codes: []
+
+    - cuda_mpi_codes: []
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 1b9bdd5145b2cd53f59a21ea5c6d784020a2102d..2578d7464d4c97b9782fc1836705151c93c4330f 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -126,15 +126,6 @@ spack:
         - abaqus@2023
         - intel-oneapi-ipp
 
-    # -------------------------------------------------------------------------
-    # Empty to specialize in environments
-    # -------------------------------------------------------------------------
-    - cuda_system_codes: []
-
-    - cuda_serial_codes: []
-
-    - cuda_mpi_codes: []
-
     # -------------------------------------------------------------------------
     # Blas dependent codes
     # -------------------------------------------------------------------------