diff --git a/stacks/pinot-noir/packages.yaml b/stacks/pinot-noir/packages.yaml
index bccb26d207481c8992a6276287c3dc44b13397cc..e7c391afa911b5e79d1cc40828d46cc09813a970 100644
--- a/stacks/pinot-noir/packages.yaml
+++ b/stacks/pinot-noir/packages.yaml
@@ -42,10 +42,7 @@ packages:
 
   cuda:
     require:
-    - spec: '@12.4.0'
-
-  # cuda:
-  #   variants: "+allow-unsupported-compilers"
+    - spec: '@12.3.2'
 
   hdf5:
     variants: +hl +threadsafe +szip +cxx +fortran
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 0ef75a9981c779b989d8b55e64c58c28026ce581..e38b9df736c15aa0ae9369c3d42746c55594aaa9 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -12,12 +12,6 @@ spack:
 
     - mpi_oneapi:
         - intel-oneapi-mpi
-    - when: env['environment'] in ['helvetios']
-      mpi_gcc_stable:
-        - openmpi
-    - when: env['environment'] in ['izar', 'jed']
-      mpi_gcc_stable:
-        - openmpi +cuda
 
     # -------------------------------------------------------------------------
     # Serial codes
@@ -26,6 +20,18 @@ spack:
         - python
         - hdf5 ~mpi
 
+    # -------------------------------------------------------------------------
+    # Environment specific
+    - when: env['environment'] in ['helvetios']
+      mpi_gcc_stable:
+        - openmpi
+    - when: env['environment'] in ['izar', 'jed']
+      mpi_gcc_stable:
+        - openmpi +cuda
+    - when: env['environment'] in ['izar', 'jed']
+      serial_codes:
+        - cuda
+
     # -------------------------------------------------------------------------
     # Generic definitions
     # -------------------------------------------------------------------------
@@ -33,6 +39,7 @@ spack:
         - $mpi_oneapi
         - $mpi_gcc_stable
 
+
   specs:
     - matrix:
         - [$compilers_specs]