diff --git a/stacks/pinot-noir/packages_helvetios.yaml b/stacks/pinot-noir/packages_helvetios.yaml
index 17d3788ff5cdea388b60175f7ce1b843ff189d7c..5990ecb6c0f25e9f31b838bed511c955538bc0ae 100644
--- a/stacks/pinot-noir/packages_helvetios.yaml
+++ b/stacks/pinot-noir/packages_helvetios.yaml
@@ -1,8 +1,7 @@
 packages:
   all:
     target: ["skylake_avx512"]
-    require:
-      - all_of: ['~cuda', '~rocm']
+    require: ['~cuda', '~rocm']
 
   py-torch:
     require:
diff --git a/stacks/pinot-noir/packages_jed.yaml b/stacks/pinot-noir/packages_jed.yaml
index c6b1ce498f0740715d6850faf4c60f171fc9c82a..186b82d655ded03701bd8fff6750cd56779a51dd 100644
--- a/stacks/pinot-noir/packages_jed.yaml
+++ b/stacks/pinot-noir/packages_jed.yaml
@@ -55,12 +55,6 @@ packages:
   # ---------------------------------------------------------------------------
   # Externals
   # ---------------------------------------------------------------------------
-  hcoll:
-    buildable: False
-    externals:
-    - spec: 'hcoll@4.8.3227'
-      prefix: /usr
-
   pmix:
     buildable: false
     externals: