diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
index 729f06ada0..a575d82a60 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
@@ -33,10 +33,15 @@ spack:
     python:
       version: [3.7.15]
     trilinos:
-      require: +amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
-        +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro
-        +phalanx +rol +rythmos +sacado +stk +shards +shylu +stratimikos +teko +tempus
-        +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+      require:
+      - one_of: [+amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
+            +intrepid +intrepid2 +isorropia +kokkos +minitensor +nox +piro +phalanx
+            +rol +rythmos +sacado +stk +shards +stratimikos +tempus +tpetra
+            +trilinoscouplings +zoltan]
+      - one_of: [gotype=long_long, gotype=all]
+      - one_of: [~ml ~muelu ~zoltan2 ~teko, +ml +muelu +zoltan2 +teko]
+      - one_of: [+superlu-dist, ~superlu-dist]
+      - one_of: [+shylu, ~shylu]
     xz:
       variants: +pic
     mesa:
@@ -139,6 +144,7 @@ spack:
   - umpire
   - upcxx
   - wannier90
+  - xyce +mpi +shared +pymi +pymi_static_tpls ^trilinos~shylu
 
   # CUDA
   - amrex +cuda
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
index 5b92e0c409..8bca38b472 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
@@ -36,10 +36,15 @@ spack:
     python:
       version: [3.8.13]
     trilinos:
-      require: +amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext
-        +ifpack +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stratimikos
-        +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+      require:
+      - one_of: [+amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
+            +intrepid +intrepid2 +isorropia +kokkos +minitensor +nox +piro +phalanx
+            +rol +rythmos +sacado +stk +shards +stratimikos +tempus +tpetra
+            +trilinoscouplings +zoltan]
+      - one_of: [gotype=long_long, gotype=all]
+      - one_of: [~ml ~muelu ~zoltan2 ~teko, +ml +muelu +zoltan2 +teko]
+      - one_of: [+superlu-dist, ~superlu-dist]
+      - one_of: [+shylu, ~shylu]
     xz:
       variants: +pic
     mesa:
@@ -147,6 +152,7 @@ spack:
   - variorum
   - veloc
   - wannier90
+  - xyce +mpi +shared +pymi +pymi_static_tpls ^trilinos~shylu
 
   # CUDA
   - amrex +cuda