diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 2ac9123c0c0c1c84a67ce79a753d17f5d13df93b..80f595df62e620a0d7767ba648e7412d598d6861 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -66,7 +66,7 @@ spack:
         - trimmomatic
         - valgrind
         - xclip
-        - zlib
+        - zlib-ng
 
     # -------------------------------------------------------------------------
     # Serial codes
@@ -82,19 +82,21 @@ spack:
         - hwloc
         - intel-oneapi-tbb
         - jasper
-        - libxc
         - mafft
         - metis
         - muscle
         - nfft
         - python
         - scotch
-        - stacks
         - star
         - subread
         - superlu
         - voropp
 
+    - gcc_serial_codes:
+        - stacks
+        - libxc
+                    
     # -------------------------------------------------------------------------
     # Empty to specialize in environments
     # -------------------------------------------------------------------------
@@ -156,6 +158,10 @@ spack:
         - [$serial_codes]
         - [$%compilers]
 
+    - matrix:
+        - [$gcc_serial_codes]
+        - [$%compiler_gcc]
+
     - matrix:
         - [$mpi_codes]
         - [$^mpi_oneapi]