diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index e6decb050cbe90a24f5c79fb6bf049d3de6ea05d..601c348582656ddf3fca86118a44a5d3e936eabb 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -37,6 +37,8 @@ spack:
     - mpi_codes:
         - osu-micro-benchmarks +graphing
         - hdf5 +mpi
+
+    - blas_mpi_python_codes
         - petsc +mpi
 
     # -------------------------------------------------------------------------
@@ -77,7 +79,27 @@ spack:
 
     - matrix:
         - [$mpi_codes]
-        - [$%compilers]
+        - [$^mpi_oneapi]
+        - [$%compiler_oneapi]
+
+    - matrix:
+        - [$mpi_codes]
+        - [$^mpi_gcc]
+        - [$%compiler_gcc]
+
+    - matrix:
+        - [$blas_mpi_python_codes]
+        - [$^blas_oneapi]
+        - [$^mpi_oneapi]
+        - ^python
+        - [$%compiler_oneapi]
+
+    - matrix:
+        - [$blas_mpi_python_codes]
+        - [$^blas_gcc]
+        - [$^mpi_gcc]
+        - ^python
+        - [$%compiler_gcc]
 
   view: false
 #    default: