diff --git a/stacks/pinot-noir/packages.yaml b/stacks/pinot-noir/packages.yaml
index e64a0d0b74e841f02eb74c60480ddbf8af170f7b..7eedf0724a4a04ab9ea7df5236d1d2c143ddd564 100644
--- a/stacks/pinot-noir/packages.yaml
+++ b/stacks/pinot-noir/packages.yaml
@@ -42,10 +42,6 @@ packages:
   # ----------------------------------------------------------------------------
   # Requirements
   # ----------------------------------------------------------------------------
-  cmake:
-    require:
-    - spec: +ownlibs
-
   cuda:
     require:
     - spec: '@12.4.0'
@@ -55,7 +51,8 @@ packages:
 
   openmpi:
     require:
-    - spec: fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +romio romio-filesystem=gpfs
+    - spec: fabrics=ofi,ucx,verbs schedulers=slurm
+            ~rsh +romio romio-filesystem=gpfs
     - spec: ^ucx +cuda
       when: +cuda
 
@@ -68,3 +65,52 @@ packages:
   libfabric:
     require:
     - spec: fabrics=mlx,mrail,psm3,verbs,udp,tcp,sockets,shm
+
+  # Core compiler packages -----------------------------------------------------
+  autoconf:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  automake:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  autotools:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  cmake:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  diffutils:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  findutils:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  gmake:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  m4:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  ncurses:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  perl:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  readline:
+    require:
+    - spec: '%gcc@11.4.0'
+
+  texinfo:
+    require:
+    - spec: '%gcc@11.4.0'