diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index ebe4b5e7aacd81a6cbb82a651353257fdae43d90..a2feb1e4f416a833c1779764fe913380d14ef874 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -8,6 +8,9 @@ packages:
       - spec: "^libiconv"
         when: "^iconv"
 
+      - spec: '+ipo'
+        when: '%gcc'
+
       - spec: ^intel-oneapi-mpi
         when: '%oneapi ^mpi'
 
@@ -38,8 +41,11 @@ packages:
       - spec: ^nvhpc+lapack
         when: '%nvhpc ^lapack'
 
-      - spec: '+ipo'
-        when: '%gcc'
+      - spec: ^openblas
+        when: '%gcc ^py-numpy'
+
+      - spec: ^intel-oneapi-mkl
+        when: '%oneapi ^py-numpy'
 
   # ----------------------------------------------------------------------------
   # Requirements
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index aae9bfb0506979adf74ddddb07f16c535d9e2a93..41049f4b2ece3c09dcfcab1ff332582e97427457 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -283,10 +283,7 @@ spack:
         - opencv
         - openfoam +metis
         - paraview +shared +python +hdf5 ~osmesa +opengl2 +egl
-        - py-fenics-basix
         - py-fenics-dolfinx
-        - py-fenics-ffcx
-        - py-fenics-ufl
         - py-h5py
         - py-horovod
         - py-keras