diff --git a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
index a1da6ae5b6fa467aa0404a6f552394dbeec2c700..2eb5060962680b618116aa244f665b2f7a336871 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-h100.yaml
@@ -14,9 +14,9 @@ packages:
   # ---------------------------------------------------------------------------
   cuda:
     prefer:
-    - spec: "^gcc-runtime@12.3.0"
+    - spec: "^gcc-runtime@13.2.0"
       when: "%gcc"
-    - spec: "%gcc@12.3.0 target=zen4"
+    - spec: "%gcc@13.2.0 target=zen4"
       when: "%gcc"
     require:
     - '@12.4.0'
@@ -64,11 +64,11 @@ packages:
   python:
     require:
     - spec: 'target=zen4'
-      when: '%gcc@12.3.0'
+      when: '%gcc@13.2.0'
 
   quantum-espresso:
     require:
-    - spec: '~cuda'
+    - spec: '+nvptx'
 
   suite-sparse:
     require:
diff --git a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
index a3d85332662510c94b46de80934198c6fec04411..f65be6c26aabc4356d2a146fd4174ac1c86c299d 100644
--- a/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
+++ b/stacks/pinot-noir-gcc13/packages_kuma-l40s.yaml
@@ -14,9 +14,9 @@ packages:
   # ---------------------------------------------------------------------------
   cuda:
     prefer:
-    - spec: "^gcc-runtime@12.3.0"
+    - spec: "^gcc-runtime@13.2.0"
       when: "%gcc"
-    - spec: "%gcc@12.3.0 target=zen4"
+    - spec: "%gcc@13.2.0 target=zen4"
       when: "%gcc"
     require:
     - '@12.4.0'
@@ -64,7 +64,7 @@ packages:
   python:
     require:
     - spec: 'target=zen4'
-      when: '%gcc@12.3.0'
+      when: '%gcc@13.2.0'
 
   quantum-espresso:
     require:
diff --git a/stacks/pinot-noir-gcc13/packages_stack.yaml b/stacks/pinot-noir-gcc13/packages_stack.yaml
index 7ae1a642b497f033fce6783a86fc50d78d1ee640..db7e046664347d4f80db7946b416656b5a553367 100644
--- a/stacks/pinot-noir-gcc13/packages_stack.yaml
+++ b/stacks/pinot-noir-gcc13/packages_stack.yaml
@@ -194,7 +194,7 @@ packages:
     - spec: '+optimizations'
       when: '%gcc'
     prefer:
-    - spec: '%gcc@12.3.0'
+    - spec: '%gcc@13.2.0'
       when: '%gcc'
 
   py-cython:
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index a942feeaee402506139139ac3fce61c40a2fecc5..01584c31a9814ebc47fcafa719035eefbb9a56f0 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -261,7 +261,7 @@ spack:
         - mumps@5.6.2
         - superlu-dist@8.2.1
         #- quantum-espresso ++mpi +scalapack +gipaw
-        #- quantum-espresso ++mpi +scalapack +gipaw hdf5=parallel
+        - quantum-espresso
 
     - gcc_mpi_blas_codes:
         - armadillo +hdf5 ^arpack-ng ++mpi ^hdf5 ++mpi