diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 644aa7dad028e831178e7a06370a934ed4a06660..112a075080cdcd1c4c282e57be2b17016f258ee2 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -14,7 +14,7 @@
     },
     "stack": {
         "mount_point": "/stack",
-        "system_arch": "arch=linux-rhel9-x86_64_v2",
+        "system_arch": "target=x86_64_v3",
         "system_compiler": {
             "gcc@11": {
                 "compiler": "gcc",
@@ -74,7 +74,10 @@
             "pcre",
             "perl",
             "pkgconf",
+            "pmix",
+            "rdma-core",
             "readline",
+            "slurm",
             "sqlite",
             "texinfo",
             "zlib-ng"
diff --git a/stacks/pinot-noir/packages.yaml b/stacks/pinot-noir/packages.yaml
index 4471a36906341fda13e3253c177cd901005d07a3..52e1dd1d80208a18755c6c8e34991796c30ec3d6 100644
--- a/stacks/pinot-noir/packages.yaml
+++ b/stacks/pinot-noir/packages.yaml
@@ -74,21 +74,15 @@ packages:
     externals:
     - spec: 'rdma-core@44.1'
       prefix: /usr
-    require:
-    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   slurm:
     buildable: false
     externals:
     - spec: 'slurm@23-11-0-1'
       prefix: /usr
-    require:
-    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'
 
   pmix:
     buildable: false
     externals:
     - spec: 'pmix@5.0.1'
       prefix: /usr
-    require:
-    - spec: '%gcc@11.4.1 arch=linux-rhel9-x86_64_v2'