diff --git a/stacks/pinot-noir/packages_jed.yaml b/stacks/pinot-noir/packages_jed.yaml
index 89f3fe6b3f1b7c50ebe24cb71b1abd7572ff4299..dcc04e3ecacc5be4b2e480c5b8056bd880dae8f8 100644
--- a/stacks/pinot-noir/packages_jed.yaml
+++ b/stacks/pinot-noir/packages_jed.yaml
@@ -6,9 +6,8 @@ packages:
 
       - spec: cuda_arch=90 target=icelake
         when: '+cuda'
-
-      - spec: '~cuda'
-        when: '%oneapi'
+      # - spec: '~cuda'
+      #   when: '%oneapi'
 
       - spec: '+cuda'
         when: '%gcc'
@@ -41,6 +40,10 @@ packages:
     require:
     - spec: '~cuda'
 
+  suite-sparse:
+    require:
+    - spec: '+cuda'
+
   ucx:
     require:
       - spec: '+xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +vfs +gdrcopy +cuda cuda_arch=90 target=icelake ~rocm'
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index a2feb1e4f416a833c1779764fe913380d14ef874..bdebbbdfef76b2672e5e2b06654aafb398f936c9 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -8,44 +8,44 @@ packages:
       - spec: "^libiconv"
         when: "^iconv"
 
-      - spec: '+ipo'
-        when: '%gcc'
+      # - spec: ^intel-oneapi-mpi
+      #   when: '%oneapi ^mpi'
 
-      - spec: ^intel-oneapi-mpi
-        when: '%oneapi ^mpi'
+      # - spec: ^openmpi
+      #   when: '%gcc ^mpi'
 
-      - spec: ^openmpi
-        when: '%gcc ^mpi'
+      # - spec: ^openmpi
+      #   when: '%aocc ^mpi'
 
-      - spec: ^openmpi
-        when: '%aocc ^mpi'
+      # - spec: ^nvhpc+mpi
+      #   when: '%nvhpc ^mpi'
 
-      - spec: ^nvhpc+mpi
-        when: '%nvhpc ^mpi'
+      # - spec: ^openblas
+      #   when: '%gcc ^blas'
 
-      - spec: ^openblas
-        when: '%gcc ^blas'
+      # - spec: ^openblas
+      #   when: '%gcc ^lapack'
 
-      - spec: ^openblas
-        when: '%gcc ^lapack'
+      # - spec: ^intel-oneapi-mkl
+      #   when: '%oneapi ^blas'
 
-      - spec: ^intel-oneapi-mkl
-        when: '%oneapi ^blas'
+      # - spec: ^intel-oneapi-mkl
+      #   when: '%oneapi ^lapack'
 
-      - spec: ^intel-oneapi-mkl
-        when: '%oneapi ^lapack'
+      # - spec: ^nvhpc+blas
+      #   when: '%nvhpc ^blas'
 
-      - spec: ^nvhpc+blas
-        when: '%nvhpc ^blas'
+      # - spec: ^nvhpc+lapack
+      #   when: '%nvhpc ^lapack'
 
-      - spec: ^nvhpc+lapack
-        when: '%nvhpc ^lapack'
+      # - spec: ^openblas
+      #   when: '%gcc ^py-numpy'
 
-      - spec: ^openblas
-        when: '%gcc ^py-numpy'
+      # - spec: ^intel-oneapi-mkl
+      #   when: '%oneapi ^py-numpy'
 
-      - spec: ^intel-oneapi-mkl
-        when: '%oneapi ^py-numpy'
+      - spec: '+ipo'
+        when: '%gcc'
 
   # ----------------------------------------------------------------------------
   # Requirements
@@ -157,7 +157,7 @@ packages:
 
   suite-sparse:
     require:
-    - spec: '@7.3.1'
+    - spec: '+graphblas'
 
   tk:
     require: ['+xft', '+xss']