diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index 0237cf3686cebe200b77747f27ecf4801c5191ca..9895757dafcf9b351573042f7ef956dd5990ba7d 100755
--- a/ci/setup_spack.sh
+++ b/ci/setup_spack.sh
@@ -50,7 +50,7 @@ done
 cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
 
 
-cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
 config:
   template_dirs:
     - ${SPACK_SYSTEM_CONFIG_PATH}/templates
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index dcd12c6ca0101ec8f1c189b7e634e3ee62361902..57d802161816c91db4efb23c0f5f8bcdd9693956 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -85,7 +85,7 @@ packages:
 
   openmpi:
     require:
-    - spec: '@5.0.3 fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs +internal-pmix'
+    - spec: 'fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs +internal-pmix'
     - spec: ^ucx +cuda
       when: +cuda
 
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index eb707d36a06c8d16299d587e370ae32765af9790..2ac9123c0c0c1c84a67ce79a753d17f5d13df93b 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -16,16 +16,16 @@ spack:
     # PE definition
     # -------------------------------------------------------------------------
     - mpi_gcc:
-        - openmpi
+        - openmpi@5.0.3
 
     - mpi_oneapi:
-        - intel-oneapi-mpi
+        - intel-oneapi-mpi@2021.12.1
 
     - blas_gcc:
-        - openblas
+        - openblas@0.3.26
 
     - blas_oneapi:
-        - intel-oneapi-mkl
+        - intel-oneapi-mkl@2024.1.0
 
     # -------------------------------------------------------------------------
     # Core packages
@@ -106,8 +106,10 @@ spack:
     - mpi_codes:
         - osu-micro-benchmarks +graphing
         - hdf5 +mpi
-        - hypre
         - parmetis
+
+    - blas_mpi_codes:
+        - hypre
         - mumps
         - superlu-dist
 
@@ -164,6 +166,18 @@ spack:
         - [$^mpi_gcc]
         - [$%compiler_gcc]
 
+    - matrix:
+        - [$blas_mpi_codes]
+        - [$^blas_oneapi]
+        - [$^mpi_oneapi]
+        - [$%compiler_oneapi]
+
+    - matrix:
+        - [$blas_mpi_codes]
+        - [$^blas_gcc]
+        - [$^mpi_gcc]
+        - [$%compiler_gcc]
+
     - matrix:
         - [$blas_mpi_python_codes]
         - [$^blas_oneapi]