diff --git a/environments/aarch64-gcc-cpu-rocky9.6/spack.yaml b/environments/aarch64-gcc-cpu-rocky9.6/spack.yaml
index 9bd92bc..07041af 100644
--- a/environments/aarch64-gcc-cpu-rocky9.6/spack.yaml
+++ b/environments/aarch64-gcc-cpu-rocky9.6/spack.yaml
@@ -64,7 +64,7 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+      variants: +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
       - +examples
@@ -195,7 +195,7 @@ spack:
   - sz3
   - tasmanian
   - tau +mpi +python +syscall +dyninst +ompt +ittnotify
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+  - trilinos +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
   - turbine
   - umap
   - umpire
diff --git a/environments/aarch64-gcc-cpu-ubuntu24.04/spack.yaml b/environments/aarch64-gcc-cpu-ubuntu24.04/spack.yaml
index a76891a..e02e640 100644
--- a/environments/aarch64-gcc-cpu-ubuntu24.04/spack.yaml
+++ b/environments/aarch64-gcc-cpu-ubuntu24.04/spack.yaml
@@ -64,7 +64,7 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+      variants: +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
       - +examples
@@ -195,7 +195,7 @@ spack:
   - sz3
   - tasmanian
   - tau +mpi +python +syscall +dyninst +ompt +ittnotify
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+  - trilinos +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
   - turbine
   - umap
   - umpire
diff --git a/environments/aarch64-gcc-cuda-rocky9.6/spack.yaml b/environments/aarch64-gcc-cuda-rocky9.6/spack.yaml
index ed7952e..4694b9c 100644
--- a/environments/aarch64-gcc-cuda-rocky9.6/spack.yaml
+++ b/environments/aarch64-gcc-cuda-rocky9.6/spack.yaml
@@ -64,9 +64,9 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
diff --git a/environments/aarch64-gcc-cuda-ubuntu24.04/spack.yaml b/environments/aarch64-gcc-cuda-ubuntu24.04/spack.yaml
index b70f32c..c064523 100644
--- a/environments/aarch64-gcc-cuda-ubuntu24.04/spack.yaml
+++ b/environments/aarch64-gcc-cuda-ubuntu24.04/spack.yaml
@@ -64,9 +64,9 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
diff --git a/environments/ppc64le-gcc-cpu-ubuntu20.04/spack.yaml b/environments/ppc64le-gcc-cpu-ubuntu20.04/spack.yaml
index 63b94b2..0ab77c3 100644
--- a/environments/ppc64le-gcc-cpu-ubuntu20.04/spack.yaml
+++ b/environments/ppc64le-gcc-cpu-ubuntu20.04/spack.yaml
@@ -47,9 +47,9 @@ spack:
     openblas:
       variants: threads=openmp
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     xz:
       variants: +pic
@@ -190,7 +190,7 @@ spack:
   - sz3
   - tasmanian
   - tau +mpi +python +dyninst +ompt # +syscall fails: https://github.com/spack/spack/pull/40830#issuecomment-1790799772;
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+  - trilinos +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
   - turbine
   - umap
   - umpire
diff --git a/environments/ppc64le-gcc-cuda-ubuntu20.04/spack.yaml b/environments/ppc64le-gcc-cuda-ubuntu20.04/spack.yaml
index 03b5f30..ef8db1e 100644
--- a/environments/ppc64le-gcc-cuda-ubuntu20.04/spack.yaml
+++ b/environments/ppc64le-gcc-cuda-ubuntu20.04/spack.yaml
@@ -47,9 +47,9 @@ spack:
     openblas:
       variants: threads=openmp
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     xz:
       variants: +pic
diff --git a/environments/x86_64-gcc-cpu-rocky9.6/spack.yaml b/environments/x86_64-gcc-cpu-rocky9.6/spack.yaml
index 5aaa4e3..7b99308 100644
--- a/environments/x86_64-gcc-cpu-rocky9.6/spack.yaml
+++ b/environments/x86_64-gcc-cpu-rocky9.6/spack.yaml
@@ -69,7 +69,7 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+      variants: +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
       - +examples
@@ -201,7 +201,7 @@ spack:
   - sz3
   - tasmanian
   - tau +mpi +python +syscall +dyninst +ompt +ittnotify
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+  - trilinos +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
   - turbine
   - umap
   - umpire
diff --git a/environments/x86_64-gcc-cpu-ubuntu24.04/spack.yaml b/environments/x86_64-gcc-cpu-ubuntu24.04/spack.yaml
index 7b06faf..f6f9c12 100644
--- a/environments/x86_64-gcc-cpu-ubuntu24.04/spack.yaml
+++ b/environments/x86_64-gcc-cpu-ubuntu24.04/spack.yaml
@@ -64,7 +64,7 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+      variants: +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
       - +examples
@@ -196,7 +196,7 @@ spack:
   - sz3
   - tasmanian
   - tau +mpi +python +syscall +dyninst +ompt +ittnotify
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+  - trilinos +amesos2 +anasazi +belos +boost +ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
   - turbine
   - umap
   - umpire
diff --git a/environments/x86_64-gcc-cuda-rocky9.6/spack.yaml b/environments/x86_64-gcc-cuda-rocky9.6/spack.yaml
index 75f5af7..3f764ac 100644
--- a/environments/x86_64-gcc-cuda-rocky9.6/spack.yaml
+++ b/environments/x86_64-gcc-cuda-rocky9.6/spack.yaml
@@ -64,9 +64,9 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
diff --git a/environments/x86_64-gcc-cuda-ubuntu24.04/spack.yaml b/environments/x86_64-gcc-cuda-ubuntu24.04/spack.yaml
index 00bc35f..bc1c74c 100644
--- a/environments/x86_64-gcc-cuda-ubuntu24.04/spack.yaml
+++ b/environments/x86_64-gcc-cuda-ubuntu24.04/spack.yaml
@@ -69,9 +69,9 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
diff --git a/environments/x86_64-gcc-rocm-ubuntu24.04/spack.yaml b/environments/x86_64-gcc-rocm-ubuntu24.04/spack.yaml
index 0833d3a..ba118df 100644
--- a/environments/x86_64-gcc-rocm-ubuntu24.04/spack.yaml
+++ b/environments/x86_64-gcc-rocm-ubuntu24.04/spack.yaml
@@ -69,9 +69,9 @@ spack:
     tbb:
       require: intel-tbb
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     vtk-m:
       require:
@@ -318,7 +318,7 @@ spack:
   - sundials +rocm amdgpu_target=gfx908
   - superlu-dist +rocm amdgpu_target=gfx908
   - tasmanian ~openmp +rocm amdgpu_target=gfx908
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack ~ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx908
+  - trilinos +amesos2 +anasazi +belos +boost ~ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx908
   - umpire +rocm amdgpu_target=gfx908
   - upcxx +rocm amdgpu_target=gfx908
   - vtk-m ~openmp +rocm amdgpu_target=gfx908
@@ -354,7 +354,7 @@ spack:
   - sundials +rocm amdgpu_target=gfx90a
   - superlu-dist +rocm amdgpu_target=gfx90a
   - tasmanian ~openmp +rocm amdgpu_target=gfx90a
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack ~ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx90a
+  - trilinos +amesos2 +anasazi +belos +boost ~ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx90a
   - umpire +rocm amdgpu_target=gfx90a
   - upcxx +rocm amdgpu_target=gfx90a
   - vtk-m ~openmp +rocm amdgpu_target=gfx90a
@@ -389,7 +389,7 @@ spack:
   - sundials +rocm amdgpu_target=gfx942
   - superlu-dist +rocm amdgpu_target=gfx942
   - tasmanian ~openmp +rocm amdgpu_target=gfx942
-  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack ~ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx942
+  - trilinos +amesos2 +anasazi +belos +boost ~ifpack2 +intrepid2 +kokkos +minitensor +muelu +nox +piro +phalanx +rol +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx942
   - umpire +rocm amdgpu_target=gfx942
   - upcxx +rocm amdgpu_target=gfx942
   - vtk-m ~openmp +rocm amdgpu_target=gfx942
diff --git a/environments/x86_64-oneapi-ubuntu24.04/spack.yaml b/environments/x86_64-oneapi-ubuntu24.04/spack.yaml
index f43b09c..510cd46 100644
--- a/environments/x86_64-oneapi-ubuntu24.04/spack.yaml
+++ b/environments/x86_64-oneapi-ubuntu24.04/spack.yaml
@@ -50,9 +50,9 @@ spack:
       variants: threads=openmp
       require: 'cppflags="-O1" target=x86_64_v3'
     trilinos:
-      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
-        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
-        +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos
+      variants: +amesos2 +anasazi +belos +boost
+        +ifpack2 +intrepid2 +kokkos +minitensor +muelu
+        +nox +piro +phalanx +rol +sacado +stk +shards +shylu +stokhos +stratimikos
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     xz:
       variants: +pic