diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 1b7591031d85b3df862f7314cafeadcc029e13c8..f454b7b315cb1b2e8e1bcd9a9a624178daac45d7 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -30,11 +30,6 @@
             "kuma_h100": "zen4"
         },
         "compilers": {
-            "gcc": {
-                "compiler": "gcc",
-                "spec": "gcc@12.3.0 %gcc@11.4.1",
-                "version": "12.3.0"
-            },
             "oneapi": {
                 "compiler": "oneapi",
                 "spec": "intel-oneapi-compilers@2024.0.2 %gcc@11.4.1",
@@ -51,6 +46,11 @@
                 "spec": "aocc@4.2.0 +license-agreed %gcc@11.4.1",
                 "version": "4.2.0",
                 "constraint": "env['environment'] in ['jed']"
+            },
+            "gcc": {
+                "compiler": "gcc",
+                "spec": "gcc@12.3.0 %gcc@11.4.1",
+                "version": "12.3.0"
             }
         },
         "system_packages": [
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index 9c1e986d80817deeefb8fe638c46846a19503529..f3db612e6267fcad5255b3ebd261259188f4cdca 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -9,11 +9,13 @@ spack:
     # -------------------------------------------------------------------------
     - mpi_gcc:
         - openmpi
+
     - mpi_oneapi:
         - intel-oneapi-mpi
 
     - blas_gcc:
         - openblas
+
     - blas_oneapi:
         - intel-oneapi-mkl
 
@@ -23,6 +25,7 @@ spack:
     - core_codes:
         - gnuplot
         - imagemagick +ghostscript
+        - lmod
 
     # -------------------------------------------------------------------------
     # Serial codes