diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 135ef4a152844a37109ac1293c93e29d53e012e3..390d6499e1a62e6595ca561cafefae4ebbc2dae6 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -7,14 +7,14 @@ spack:
     # -------------------------------------------------------------------------
     # PE definition
     # -------------------------------------------------------------------------
-    - mpi_gcc_stable:
+    - mpi_gcc:
         - openmpi
-    - mpi_oneapi_stable:
+    - mpi_oneapi:
         - intel_oneapi_mpi
 
-    - blas_gcc_stable:
+    - blas_gcc:
         - openblas
-    - blas_oneapi_stable:
+    - blas_oneapi:
         - intel_oneapi_mkl
 
     # -------------------------------------------------------------------------
@@ -43,21 +43,29 @@ spack:
     # Generic definitions
     # -------------------------------------------------------------------------
     - mpis:
-        - $mpi_oneapi_stable
-        - $mpi_gcc_stable
+        - $mpi_oneapi
+        - $mpi_gcc
 
 
   specs:
     - matrix:
         - [$compilers_specs]
 
+    - matrix:
+        - [$blas_oneapi]
+        - [$%compiler_oneapi]
+
+    - matrix:
+        - [$blas_gcc]
+        - [$%compiler_gcc]
+
     - matrix:
         - [$mpi_oneapi]
         - [$%compiler_oneapi]
 
     - matrix:
-        - [$mpi_gcc_stable]
-        - [$%compiler_gcc_stable]
+        - [$mpi_gcc]
+        - [$%compiler_gcc]
 
     - matrix:
         - [$core_codes]