diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
index 83632dc95a4..5351e6feb7d 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
@@ -57,6 +57,7 @@ spack:
       require:
       - gromacs@2024.3 ^armpl-gcc ^openmpi
       - "%gcc"
+      - target=neoverse_v1
     libfabric:
       buildable: true
       externals:
@@ -64,33 +65,42 @@ spack:
         spec: libfabric@1.17.0
       require:
       - fabrics=shm,efa
+      - target=neoverse_v1
     llvm:
       variants: ~lldb
     mpas-model:
       require:
       - precision=single ^parallelio+pnetcdf
       - "%gcc"
+      - target=neoverse_v1
     mpich:
       require:
       - mpich pmi=pmi2 device=ch4 netmod=ofi +slurm
+      - target=neoverse_v1
     nvhpc:
       require:
       - "target=aarch64"
     openfoam:
       require:
       - openfoam ^scotch@6.0.9
+      - target=neoverse_v1
     openmpi:
       variants: ~atomics ~cuda ~cxx ~cxx_exceptions ~internal-hwloc ~java +legacylaunchers ~lustre ~memchecker +pmi +romio ~singularity +vt +wrapper-rpath fabrics=ofi schedulers=slurm
-      require: '@4:'
+      require:
+      - '@4:'
+      - target=neoverse_v1
     # Palace does not build correctly with armpl until https://github.com/awslabs/palace/pull/207 is merged into a version.
     # palace:
     #   require:
     #     - one_of: ["palace cxxflags=\"-include cstdint\" ^fmt@9.1.0"]
     pmix:
-      require: "pmix@3:"
+      require:
+      - "pmix@3:"
+      - target=neoverse_v1
     quantum-espresso:
       require:
       - quantum-espresso@6.6 %gcc ^armpl-gcc
+      - target=neoverse_v1
     slurm:
       buildable: false
       externals:
@@ -99,8 +109,10 @@ spack:
       require:
       - "+pmix"
     all:
+      target: ["neoverse_v1"]
       require:
       - "%gcc"
+      - "target=neoverse_v1"
       providers:
         blas: [armpl-gcc, openblas]
         fftw-api: [armpl-gcc, fftw]
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-aarch64-darwin/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-aarch64-darwin/spack.yaml
index ebf597acb27..01d7c2a8cfa 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-aarch64-darwin/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-aarch64-darwin/spack.yaml
@@ -3,6 +3,7 @@ spack:
 
   packages:
     all:
+      target: ["aarch64"]
       require: target=aarch64
 
   config:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-x86_64-linux-gnu/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-x86_64-linux-gnu/spack.yaml
index 67d5b20fa32..aa1b011719a 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-x86_64-linux-gnu/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/bootstrap-x86_64-linux-gnu/spack.yaml
@@ -3,6 +3,7 @@ spack:
 
   packages:
     all:
+      target: ["x86_64_v3"]
       require: target=x86_64_v3
 
   config:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
index 2f5177af30d..8639cd195f3 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
@@ -2,6 +2,7 @@ spack:
   view: false
   packages:
     all:
+      target: ["x86_64_v3"]
       require:
       - target=x86_64_v3
     c:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
index a85e004104e..55c96cabff2 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
@@ -2,32 +2,43 @@ spack:
   view: false
   packages:
     all:
-      require: target=x86_64_v3
+      target: ["x86_64_v3"]
+      require:
+      - target=x86_64_v3
     cmake:
       variants: ~ownlibs
     ecp-data-vis-sdk:
       require:
       - "+ascent +adios2 +cinema +darshan +faodel +hdf5 +pnetcdf +sensei +sz +unifyfs +veloc +vtkm +zfp"
+      - target=x86_64_v3
     hdf5:
       require:
       - "@1.14"
+      - target=x86_64_v3
     mesa:
       require:
       - "+glx +osmesa +opengl ~opengles +llvm"
+      - target=x86_64_v3
     libglx:
       require: "mesa +glx"
     ospray:
       require:
       - "@2.8.0"
       - "+denoiser +mpi"
+      - target=x86_64_v3
     llvm:
-      require: ["@14:"]
+      require:
+      - "@14:"
+      - target=x86_64_v3
       # Minimize LLVM
       variants: ~lldb~lld~libomptarget~polly~gold libunwind=none compiler-rt=none
     libllvm:
       require: ["llvm"]
     visit:
-      require: ["@3.4.1"]
+      require:
+      - "@3.4.1"
+      - target=x86_64_v3
+
 
   concretizer:
     unify: when_possible
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
index a9ff3d5afdd..857886f6b23 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
@@ -44,7 +44,9 @@ spack:
       - netlib-scalapack
 
     ncurses:
-      require: +termlib ldflags=-Wl,--undefined-version
+      require:
+      - +termlib ldflags=-Wl,--undefined-version
+      - target=x86_64_v3
     tbb:
       require: "intel-tbb"
     binutils:
@@ -78,6 +80,7 @@ spack:
     petsc:
       require:
       - "+batch"
+      - target=x86_64_v3
     trilinos:
       require:
       - one_of: [+amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml
index a2acd99dbf9..c1aa18a45b2 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml
@@ -10,12 +10,16 @@ spack:
       require:
       - "%gcc"
       - target=neoverse_v2
+      target: ["neoverse_v2"]
       providers:
         blas: [openblas]
         mpi: [mpich]
       variants: +mpi
     binutils:
       variants: +ld +gold +headers +libiberty ~nls
+    blas:
+      require:
+      - openblas
     hdf5:
       variants: +fortran +hl +shared
     libfabric:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
index 3027875ed7b..ffd722564cf 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
@@ -8,6 +8,7 @@ spack:
 
   packages:
     all:
+      target: ["x86_64_v3"]
       require:
       - "%gcc"
       - target=x86_64_v3
@@ -17,20 +18,34 @@ spack:
         tbb: [intel-tbb]
       variants: +mpi
     acts:
-      require: +analysis +dd4hep +edm4hep +examples +fatras +geant4 +hepmc3 +podio +pythia8 +python +svg +tgeo cxxstd=20
+      require:
+      - +analysis +dd4hep +edm4hep +examples +fatras +geant4 +hepmc3 +podio +pythia8 +python +svg +tgeo cxxstd=20
+      - target=x86_64_v3
     celeritas:
-      require: +geant4 +hepmc3 +root +shared cxxstd=20
+      require:
+      - +geant4 +hepmc3 +root +shared cxxstd=20
+      - target=x86_64_v3
     geant4:
-      require: +opengl +qt +threads +x11
+      require:
+      - +opengl +qt +threads +x11
+      - target=x86_64_v3
     hip:
-      require: '@5.7.1 +rocm'
+      require:
+      - '@5.7.1 +rocm'
+      - target=x86_64_v3
     rivet:
-      require: hepmc=3
+      require:
+      - hepmc=3
+      - target=x86_64_v3
     root:
-      require: +arrow ~daos +davix +dcache +emacs +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +tmva-cpu +unuran +vc +vdt +veccore +webgui +x +xml +xrootd # cxxstd=20
+      require:
+      - +arrow ~daos +davix +dcache +emacs +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +tmva-cpu +unuran +vc +vdt +veccore +webgui +x +xml +xrootd # cxxstd=20
       # note: root cxxstd=20 not concretizable within sherpa
+      - target=x86_64_v3
     vecgeom:
-      require: +gdml +geant4 +root +shared cxxstd=20
+      require:
+      - +gdml +geant4 +root +shared cxxstd=20
+      - target=x86_64_v3
 
     # Mark geant4 data as external to prevent wasting bandwidth on GB-scale files
     geant4-data:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml
index c0a63b995e3..253e1a00ba0 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml
@@ -3,6 +3,7 @@ spack:
 
   packages:
     all:
+      target: ["aarch64"]
       require:
       - target=aarch64
       - +mps
@@ -11,7 +12,9 @@ spack:
     mpi:
       require: mpich
     openblas:
-      require: ~fortran
+      require:
+      - ~fortran
+      - target=aarch64
 
   specs:
   # Horovod
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cpu/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cpu/spack.yaml
index 23ed6aa665e..544e097849e 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cpu/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cpu/spack.yaml
@@ -2,6 +2,7 @@ spack:
   view: false
   packages:
     all:
+      target: ["aarch64"]
       require:
       - target=aarch64
       - ~cuda
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cuda/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cuda/spack.yaml
index d37f8ec7d27..563ec83dc2c 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cuda/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-aarch64-cuda/spack.yaml
@@ -2,6 +2,7 @@ spack:
   view: false
   packages:
     all:
+      target: ["aarch64"]
       require:
       - target=aarch64
       - ~rocm
@@ -9,7 +10,9 @@ spack:
       - cuda_arch=80
     llvm:
       # https://github.com/spack/spack/issues/27999
-      require: ~cuda
+      require:
+      - ~cuda
+      - target=aarch64
     mpi:
       require: openmpi
     py-torch:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml
index 31ca52dd394..10668744aae 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml
@@ -2,6 +2,7 @@ spack:
   view: false
   packages:
     all:
+      target: ["x86_64_v3"]
       require:
       - target=x86_64_v3
       - ~cuda
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml
index 7b508debd37..d4248acd34c 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml
@@ -2,6 +2,7 @@ spack:
   view: false
   packages:
     all:
+      target: ["x86_64_v3"]
       require:
       - target=x86_64_v3
       - ~rocm
@@ -9,7 +10,9 @@ spack:
       - cuda_arch=80
     llvm:
       # https://github.com/spack/spack/issues/27999
-      require: ~cuda
+      require: 
+      - ~cuda
+      - target=x86_64_v3
     mpi:
       require: openmpi
     py-torch:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml
index a285c131f7c..54a082376ab 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml
@@ -2,6 +2,7 @@ spack:
   view: false
   packages:
     all:
+      target: ["x86_64_v3"]
       require:
       - target=x86_64_v3
       - ~cuda
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml
index c5a1259ba62..e2102e4d2c7 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml
@@ -2,15 +2,16 @@ spack:
   view: false
   packages:
     all:
-      providers:
-        blas:
-          - openblas
-        mkl:
-          - intel-oneapi-mkl
-        mpi:
-          - openmpi
-          - mpich
-      variants: +mpi
+      target: ["target=aarch64"]
+      require:
+      - "target=aarch64"
+      - "+mpi"
+    blas:
+      require:
+      - openblas
+    mpi:
+      require:
+      - openmpi
 
   definitions:
   - radiuss:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
index 867c2ae9a62..f707fdc01ef 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
@@ -2,6 +2,7 @@ spack:
   view: false
   packages:
     all:
+      target: [ "x86_64_v3" ]
       require:
       - target=x86_64_v3
       - '%gcc@7.5.0'