diff --git a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
index 944276b8cffaf32bb24a066377e252f98cedff4f..5be710f6b0a77f62f76af52706c7043210e4ddb5 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
@@ -28,7 +28,7 @@ packages:
 
   kokkos:
     require:
-    - spec: '+cuda +cuda_lambda cuda_arch=90 +cuda_uvm +wrapper ~openmptarget'
+    - spec: '+cuda +cuda_lambda cuda_arch=90 +wrapper ~openmptarget'
       when: '%gcc'
 
   kokkos-kernels:
diff --git a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
index 7816954428e755fc7052c6ce9ddcdeb455a35c8c..5dabe12c6ca6e8c03c5a4905b0711d9db631d992 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
@@ -28,7 +28,7 @@ packages:
 
   kokkos:
     require:
-    - spec: '+cuda +cuda_lambda cuda_arch=89 +cuda_uvm +wrapper ~openmptarget'
+    - spec: '+cuda +cuda_lambda cuda_arch=89 +wrapper ~openmptarget'
       when: '%gcc'
 
   kokkos-kernels:
diff --git a/stacks/pinot-noir-gcc13/packages_stack.yaml b/stacks/pinot-noir-gcc13/packages_stack.yaml
index db7e046664347d4f80db7946b416656b5a553367..cd9787a9341ff1a2092ef0f198bc1015f792acb3 100644
--- a/stacks/pinot-noir-gcc13/packages_stack.yaml
+++ b/stacks/pinot-noir-gcc13/packages_stack.yaml
@@ -84,11 +84,13 @@ packages:
     require: ['@1.10.4']
 
   kokkos:
-    require: ['+openmp', '+numactl', '+memkind', '~threads',
-             '+aggressive_vectorization', '@4.3.01']
+    require: ['+numactl', '+memkind', '+serial',
+              '+openmp', '~openmptarget',
+              '+threads', '~sycl',
+              '+aggressive_vectorization', '@4.3.01']
 
   kokkos-kernels:
-    require: ['@4.3.01', '+openmp', '~threads', '~ipo']
+    require: ['@4.3.01', '+openmp', '+threads', '~ipo']
 
   kokkos-nvcc-wrapper:
     prefer: ['@4.3.01']
@@ -161,6 +163,9 @@ packages:
   mpfr:
     require: ['@4.0.2']
 
+  mumps:
+    require: ['+openmp', '+metis', '+parmetis']
+
   netcdf-c:
     prefer: ['+mpi']
 
@@ -186,7 +191,7 @@ packages:
 
   petsc:
     require:
-    - spec: '+hypre +mumps +saws +scalapack +mpi +suite-sparse +kokkos'
+    - spec: '+hypre +mumps +saws +scalapack +mpi +suite-sparse +kokkos +openmp'
 
   python:
     require: