diff --git a/stacks/pinot-noir/packages.yaml b/stacks/pinot-noir/packages.yaml
index 7eedf0724a4a04ab9ea7df5236d1d2c143ddd564..a08dacbe13c67a2b27e94ff4a3e070cf8bd8d4c9 100644
--- a/stacks/pinot-noir/packages.yaml
+++ b/stacks/pinot-noir/packages.yaml
@@ -49,6 +49,10 @@ packages:
   hdf5:
     variants: +hl +threadsafe +szip +cxx +fortran
 
+  libfabric:
+    require:
+    - spec: fabrics=mlx,mrail,psm3,verbs,udp,tcp,sockets,shm
+
   openmpi:
     require:
     - spec: fabrics=ofi,ucx,verbs schedulers=slurm
@@ -56,61 +60,63 @@ packages:
     - spec: ^ucx +cuda
       when: +cuda
 
+  python:
+    require:
+    - spec: +optmimizations
+      when: '%gcc'
+
   ucx:
     require:
     - spec: +rdmacm +rc +dc +ud +cma +verbs
     - spec: +gdrcopy
       when: +cuda
 
-  libfabric:
-    require:
-    - spec: fabrics=mlx,mrail,psm3,verbs,udp,tcp,sockets,shm
 
   # Core compiler packages -----------------------------------------------------
   autoconf:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   automake:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   autotools:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   cmake:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   diffutils:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   findutils:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   gmake:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   m4:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   ncurses:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   perl:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   readline:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   texinfo:
     require:
-    - spec: '%gcc@11.4.0'
+    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 7e65af19ead30d529fc85ca8703bc5b3c78aeb11..f9c2ea23975652dde8927095deca791f11762298 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -14,11 +14,18 @@ spack:
     - mpi_oneapi:
         - intel-oneapi-mpi
 
+    # -------------------------------------------------------------------------
+    # Core packages
+    # -------------------------------------------------------------------------
+    - core_codes:
+        - gnuplot
+        - imagemagick +ghostscript
+
     # -------------------------------------------------------------------------
     # Serial codes
     # -------------------------------------------------------------------------
     - serial_codes:
-        - python
+        - python +tkinter +ssl
         - hdf5 ~mpi
 
     # -------------------------------------------------------------------------
@@ -53,6 +60,10 @@ spack:
         - [$mpi_gcc_stable]
         - [$%compiler_gcc_stable]
 
+    - matrix:
+        - [$core_codes]
+        - [$%system_compiler]
+
     - matrix:
         - [$serial_codes]
         - [$%compilers]