diff --git a/stacks/pinot-noir/packages_kuma-l40s.yaml b/stacks/pinot-noir/packages_kuma-l40s.yaml
index a1b6aef1ba3ec155b9dedcdc3825c7206f3222f0..59799535214e2b4215012df3a1c6af61196798c5 100644
--- a/stacks/pinot-noir/packages_kuma-l40s.yaml
+++ b/stacks/pinot-noir/packages_kuma-l40s.yaml
@@ -1,16 +1,26 @@
 packages:
   all:
     target: ["zen4"]
+    prefer: ["zen4"]
     require:
       - "~rocm"
 
-      - spec: cuda_arch=89 target=zen4
+      - spec: cuda_arch=89
         when: '+cuda'
 
       - spec: '+cuda'
         when: '%gcc'
 
   # ---------------------------------------------------------------------------
+  cuda:
+    prefer:
+    - spec: "^gcc-runtime@12.3.0"
+      when: "%gcc"
+    - spec: "%gcc@12.3.0 target=zen4"
+      when: "%gcc"
+    require:
+    - '@12.4.0'
+
   hypre:
     require:
     - spec: '+cuda cuda_arch=89 +unified-memory'
@@ -27,7 +37,10 @@ packages:
 
   openmpi:
     require:
-      - spec: '+cuda cuda_arch=89 target=zen4'
+      - spec: '+cuda cuda_arch=89'
+
+  papi:
+    require: ['+nvml', '+infiniband', '+cuda']
 
   petsc:
     require:
@@ -42,6 +55,11 @@ packages:
     require:
     - spec: '+cuda cuda_arch=89 +nccl +cudnn'
 
+  python:
+    require:
+    - spec: 'target=zen4'
+      when: '%gcc@12.3.0'
+
   quantum-espresso:
     require:
     - spec: '~cuda'
@@ -52,7 +70,7 @@ packages:
 
   ucx:
     require:
-      - spec: '+xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +gdrcopy +cuda cuda_arch=89 ~rocm target=zen4'
+      - spec: '+xpmem +cma +rdmacm +rc +ud +dc +verbs +ib_hw_tm +gdrcopy +cuda cuda_arch=89 ~rocm'
 
   # ---------------------------------------------------------------------------
   # Externals