From ef9967c7f40dcd852e31ee26bc2f537f458eb8fc Mon Sep 17 00:00:00 2001
From: Shahzeb Siddiqui <shahzebmsiddiqui@gmail.com>
Date: Wed, 29 Sep 2021 20:57:52 -0400
Subject: Add e4s tags  (#23382)

Add 'e4s' tags for all packages according to https://github.com/E4S-Project/e4s/blob/master/E4S_Products.md
---
 var/spack/repos/builtin/packages/adios2/package.py           | 2 ++
 var/spack/repos/builtin/packages/aml/package.py              | 2 ++
 var/spack/repos/builtin/packages/amrex/package.py            | 2 ++
 var/spack/repos/builtin/packages/aomp/package.py             | 3 +++
 var/spack/repos/builtin/packages/arborx/package.py           | 2 ++
 var/spack/repos/builtin/packages/archer/package.py           | 2 ++
 var/spack/repos/builtin/packages/argobots/package.py         | 2 ++
 var/spack/repos/builtin/packages/ascent/package.py           | 2 +-
 var/spack/repos/builtin/packages/bolt/package.py             | 2 ++
 var/spack/repos/builtin/packages/cabana/package.py           | 2 ++
 var/spack/repos/builtin/packages/caliper/package.py          | 2 ++
 var/spack/repos/builtin/packages/chai/package.py             | 2 ++
 var/spack/repos/builtin/packages/charliecloud/package.py     | 2 ++
 var/spack/repos/builtin/packages/conduit/package.py          | 2 +-
 var/spack/repos/builtin/packages/darshan-runtime/package.py  | 1 +
 var/spack/repos/builtin/packages/darshan-util/package.py     | 2 ++
 var/spack/repos/builtin/packages/datatransferkit/package.py  | 2 ++
 var/spack/repos/builtin/packages/dyninst/package.py          | 2 ++
 var/spack/repos/builtin/packages/faodel/package.py           | 2 ++
 var/spack/repos/builtin/packages/flecsi/package.py           | 2 ++
 var/spack/repos/builtin/packages/flit/package.py             | 2 ++
 var/spack/repos/builtin/packages/flux-core/package.py        | 2 +-
 var/spack/repos/builtin/packages/flux-sched/package.py       | 2 +-
 var/spack/repos/builtin/packages/fortrilinos/package.py      | 1 +
 var/spack/repos/builtin/packages/gasnet/package.py           | 2 ++
 var/spack/repos/builtin/packages/geopm/package.py            | 2 ++
 var/spack/repos/builtin/packages/ginkgo/package.py           | 2 ++
 var/spack/repos/builtin/packages/globalarrays/package.py     | 2 ++
 var/spack/repos/builtin/packages/gotcha/package.py           | 2 ++
 var/spack/repos/builtin/packages/hdf5/package.py             | 2 ++
 var/spack/repos/builtin/packages/heffte/package.py           | 1 +
 var/spack/repos/builtin/packages/hpctoolkit/package.py       | 2 ++
 var/spack/repos/builtin/packages/hpx/package.py              | 2 ++
 var/spack/repos/builtin/packages/hypre/package.py            | 2 ++
 var/spack/repos/builtin/packages/kokkos-kernels/package.py   | 2 ++
 var/spack/repos/builtin/packages/kokkos/package.py           | 2 ++
 var/spack/repos/builtin/packages/legion/package.py           | 2 +-
 var/spack/repos/builtin/packages/libnrm/package.py           | 2 ++
 var/spack/repos/builtin/packages/libquo/package.py           | 2 ++
 var/spack/repos/builtin/packages/llvm-doe/package.py         | 1 +
 var/spack/repos/builtin/packages/llvm/package.py             | 2 ++
 var/spack/repos/builtin/packages/loki/package.py             | 1 +
 var/spack/repos/builtin/packages/magma/package.py            | 2 ++
 var/spack/repos/builtin/packages/mercury/package.py          | 2 +-
 var/spack/repos/builtin/packages/metall/package.py           | 2 ++
 var/spack/repos/builtin/packages/mfem/package.py             | 2 +-
 var/spack/repos/builtin/packages/mpark-variant/package.py    | 2 ++
 var/spack/repos/builtin/packages/mpich/package.py            | 2 +-
 var/spack/repos/builtin/packages/mpifileutils/package.py     | 2 ++
 var/spack/repos/builtin/packages/netlib-scalapack/package.py | 1 +
 var/spack/repos/builtin/packages/ninja/package.py            | 2 ++
 var/spack/repos/builtin/packages/nvhpc/package.py            | 1 +
 var/spack/repos/builtin/packages/omega-h/package.py          | 2 +-
 var/spack/repos/builtin/packages/openmpi/package.py          | 2 ++
 var/spack/repos/builtin/packages/openpmd-api/package.py      | 2 ++
 var/spack/repos/builtin/packages/papi/package.py             | 2 ++
 var/spack/repos/builtin/packages/papyrus/package.py          | 2 ++
 var/spack/repos/builtin/packages/parallel-netcdf/package.py  | 2 ++
 var/spack/repos/builtin/packages/paraview/package.py         | 1 +
 var/spack/repos/builtin/packages/parsec/package.py           | 1 +
 var/spack/repos/builtin/packages/pdt/package.py              | 2 ++
 var/spack/repos/builtin/packages/petsc/package.py            | 2 ++
 var/spack/repos/builtin/packages/phist/package.py            | 1 +
 var/spack/repos/builtin/packages/plasma/package.py           | 2 ++
 var/spack/repos/builtin/packages/precice/package.py          | 2 ++
 var/spack/repos/builtin/packages/pumi/package.py             | 4 +++-
 var/spack/repos/builtin/packages/py-cinemasci/package.py     | 2 ++
 var/spack/repos/builtin/packages/py-jupyterhub/package.py    | 2 ++
 var/spack/repos/builtin/packages/py-libensemble/package.py   | 2 ++
 var/spack/repos/builtin/packages/py-warpx/package.py         | 2 ++
 var/spack/repos/builtin/packages/qthreads/package.py         | 2 ++
 var/spack/repos/builtin/packages/raja/package.py             | 2 +-
 var/spack/repos/builtin/packages/rempi/package.py            | 1 +
 var/spack/repos/builtin/packages/scr/package.py              | 2 ++
 var/spack/repos/builtin/packages/slate/package.py            | 1 +
 var/spack/repos/builtin/packages/slepc/package.py            | 1 +
 var/spack/repos/builtin/packages/stc/package.py              | 2 ++
 var/spack/repos/builtin/packages/strumpack/package.py        | 2 ++
 var/spack/repos/builtin/packages/sundials/package.py         | 2 +-
 var/spack/repos/builtin/packages/superlu-dist/package.py     | 2 ++
 var/spack/repos/builtin/packages/superlu/package.py          | 2 ++
 var/spack/repos/builtin/packages/swig/package.py             | 2 ++
 var/spack/repos/builtin/packages/sz/package.py               | 2 ++
 var/spack/repos/builtin/packages/tasmanian/package.py        | 1 +
 var/spack/repos/builtin/packages/tau/package.py              | 2 ++
 var/spack/repos/builtin/packages/trilinos/package.py         | 2 ++
 var/spack/repos/builtin/packages/umap/package.py             | 2 ++
 var/spack/repos/builtin/packages/umpire/package.py           | 2 +-
 var/spack/repos/builtin/packages/unifyfs/package.py          | 2 ++
 var/spack/repos/builtin/packages/upcxx/package.py            | 4 +++-
 var/spack/repos/builtin/packages/veloc/package.py            | 2 +-
 var/spack/repos/builtin/packages/vtk-m/package.py            | 1 +
 var/spack/repos/builtin/packages/warpx/package.py            | 1 +
 var/spack/repos/builtin/packages/zfp/package.py              | 2 +-
 94 files changed, 161 insertions(+), 16 deletions(-)

diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index 822c5b9817..f3b28168cb 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -18,6 +18,8 @@ class Adios2(CMakePackage):
 
     maintainers = ['ax3l', 'chuckatkins', 'williamfgc']
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('2.7.1', sha256='c8e237fd51f49d8a62a0660db12b72ea5067512aa7970f3fcf80b70e3f87ca3e')
     version('2.7.0', sha256='4b5df1a1f92d7ff380416dec7511cfcfe3dc44da27e486ed63c3e6cffb173924')
diff --git a/var/spack/repos/builtin/packages/aml/package.py b/var/spack/repos/builtin/packages/aml/package.py
index f6f73d4f71..74897b6c1d 100644
--- a/var/spack/repos/builtin/packages/aml/package.py
+++ b/var/spack/repos/builtin/packages/aml/package.py
@@ -18,6 +18,8 @@ class Aml(AutotoolsPackage):
 
     test_requires_compiler = True
 
+    tags = ['e4s']
+
     version('0.1.0', sha256='cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b')
     version('master', branch='master', submodules=True)
 
diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py
index 9521b8e225..52d4a5a230 100644
--- a/var/spack/repos/builtin/packages/amrex/package.py
+++ b/var/spack/repos/builtin/packages/amrex/package.py
@@ -15,6 +15,8 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage):
     url      = "https://github.com/AMReX-Codes/amrex/releases/download/20.05/amrex-20.05.tar.gz"
     git      = "https://github.com/AMReX-Codes/amrex.git"
 
+    tags = ['ecp', 'e4s']
+
     maintainers = ['WeiqunZhang', 'asalmgren']
 
     version('develop', branch='development')
diff --git a/var/spack/repos/builtin/packages/aomp/package.py b/var/spack/repos/builtin/packages/aomp/package.py
index 148f4a54f6..d13ec091f2 100644
--- a/var/spack/repos/builtin/packages/aomp/package.py
+++ b/var/spack/repos/builtin/packages/aomp/package.py
@@ -92,6 +92,9 @@ class Aomp(Package):
     url = tools_url + "/aomp/archive/rocm-3.10.0.tar.gz"
 
     maintainers = ['srekolam', 'arjun-raj-kuppala', 'estewart08']
+
+    tags = ['e4s']
+
     version('3.10.0', sha256=versions_dict['3.10.0']['aomp'])
     version('3.9.0', sha256=versions_dict['3.9.0']['aomp'])
     version('3.8.0', sha256=versions_dict['3.8.0']['aomp'])
diff --git a/var/spack/repos/builtin/packages/arborx/package.py b/var/spack/repos/builtin/packages/arborx/package.py
index a0c3c4c31c..30685bd9d5 100644
--- a/var/spack/repos/builtin/packages/arborx/package.py
+++ b/var/spack/repos/builtin/packages/arborx/package.py
@@ -13,6 +13,8 @@ class Arborx(CMakePackage):
     url      = "https://github.com/arborx/arborx/archive/v0.9-beta.tar.gz"
     git      = "https://github.com/arborx/arborx.git"
 
+    tags = ['e4s']
+
     maintainers = ['aprokop']
 
     version('master',   branch='master')
diff --git a/var/spack/repos/builtin/packages/archer/package.py b/var/spack/repos/builtin/packages/archer/package.py
index a04f74d098..576c336572 100644
--- a/var/spack/repos/builtin/packages/archer/package.py
+++ b/var/spack/repos/builtin/packages/archer/package.py
@@ -15,6 +15,8 @@ class Archer(CMakePackage):
     homepage = "https://github.com/PRUNERS/ARCHER"
     url      = "https://github.com/PRUNERS/archer/archive/v1.0.0.tar.gz"
 
+    tags = ['e4s']
+
     test_requires_compiler = True
 
     version('2.0.0', sha256='3241cadb0078403368b69166b27f815e12c350486d4ceb3fb33147895b9ebde8')
diff --git a/var/spack/repos/builtin/packages/argobots/package.py b/var/spack/repos/builtin/packages/argobots/package.py
index 3683431eec..07505c20a6 100644
--- a/var/spack/repos/builtin/packages/argobots/package.py
+++ b/var/spack/repos/builtin/packages/argobots/package.py
@@ -20,6 +20,8 @@ class Argobots(AutotoolsPackage):
     git      = "https://github.com/pmodels/argobots.git"
     maintainers = ['shintaro-iwasaki']
 
+    tags = ['e4s']
+
     version("main", branch="main")
     version("1.1", sha256="f0f971196fc8354881681c2282a2f2adb6d48ff5e84cf820ca657daad1549005")
     version("1.0.1", sha256="fa05a02d7f8f74d845647636609219ee02f6adf628ebcbf40393f829987d9036")
diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py
index 58968d9514..dacad32465 100644
--- a/var/spack/repos/builtin/packages/ascent/package.py
+++ b/var/spack/repos/builtin/packages/ascent/package.py
@@ -36,7 +36,7 @@ class Ascent(CMakePackage, CudaPackage):
     homepage = "https://github.com/Alpine-DAV/ascent"
     git      = "https://github.com/Alpine-DAV/ascent.git"
     url      = "https://github.com/Alpine-DAV/ascent/releases/download/v0.5.1/ascent-v0.5.1-src-with-blt.tar.gz"
-    tags     = ['radiuss']
+    tags     = ['radiuss', 'e4s']
 
     maintainers = ['cyrush']
 
diff --git a/var/spack/repos/builtin/packages/bolt/package.py b/var/spack/repos/builtin/packages/bolt/package.py
index 554c183f20..2bd0ad663f 100644
--- a/var/spack/repos/builtin/packages/bolt/package.py
+++ b/var/spack/repos/builtin/packages/bolt/package.py
@@ -24,6 +24,8 @@ class Bolt(CMakePackage):
     git      = "https://github.com/pmodels/bolt.git"
     maintainers = ['shintaro-iwasaki']
 
+    tags = ['e4s']
+
     version("main", branch="main")
     version("2.0", sha256="f84b6a525953edbaa5d28748ef3ab172a3b6f6899b07092065ba7d1ccc6eb5ac")
     version("1.0.1", sha256="769e30dfc4042cee7ebbdadd23cf08796c03bcd8b335f516dc8cbc3f8adfa597")
diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py
index 9d2b83ff5d..f56228c061 100644
--- a/var/spack/repos/builtin/packages/cabana/package.py
+++ b/var/spack/repos/builtin/packages/cabana/package.py
@@ -16,6 +16,8 @@ class Cabana(CMakePackage):
 
     maintainers = ["junghans", "sslattery", "streeve"]
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('0.4.0', sha256='c347d23dc4a5204f9cc5906ccf3454f0b0b1612351bbe0d1c58b14cddde81e85')
     version('0.3.0', sha256='fb67ab9aaf254b103ae0eb5cc913ddae3bf3cd0cf6010e9686e577a2981ca84f')
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
index e85301a379..20639549c9 100644
--- a/var/spack/repos/builtin/packages/caliper/package.py
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -21,6 +21,8 @@ class Caliper(CMakePackage, CudaPackage):
     url      = "https://github.com/LLNL/Caliper/archive/v2.6.0.tar.gz"
     tags     = ['radiuss']
 
+    tags = ['e4s']
+
     maintainers = ["daboehme"]
 
     test_requires_compiler = True
diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py
index ee31599863..2a70fc800a 100644
--- a/var/spack/repos/builtin/packages/chai/package.py
+++ b/var/spack/repos/builtin/packages/chai/package.py
@@ -19,6 +19,8 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     maintainers = ['davidbeckingsale']
 
+    tags = ['ecp', 'e4s']
+
     version('develop', branch='develop', submodules=True)
     version('main', branch='main', submodules=True)
     version('2.4.0', tag='v2.4.0', submodules=True)
diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py
index a1971f2718..70f65f2e2a 100644
--- a/var/spack/repos/builtin/packages/charliecloud/package.py
+++ b/var/spack/repos/builtin/packages/charliecloud/package.py
@@ -14,6 +14,8 @@ class Charliecloud(AutotoolsPackage):
     url      = "https://github.com/hpc/charliecloud/releases/download/v0.18/charliecloud-0.18.tar.gz"
     git      = "https://github.com/hpc/charliecloud.git"
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('0.25',   sha256='62d6fd211e3a573f54578e1b01d5c298f9788b7eaf2db46ac94c2dcef604cc94')
     version('0.24',   sha256='63379bcbad7b90b33457251696d6720416e4acefcf2b49cd6cb495a567e511c2')
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py
index c267f0d333..45be5e0027 100644
--- a/var/spack/repos/builtin/packages/conduit/package.py
+++ b/var/spack/repos/builtin/packages/conduit/package.py
@@ -36,7 +36,7 @@ class Conduit(CMakePackage):
     homepage = "https://software.llnl.gov/conduit"
     url      = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz"
     git      = "https://github.com/LLNL/conduit.git"
-    tags     = ['radiuss']
+    tags     = ['radiuss', 'e4s']
 
     version('develop', branch='develop', submodules=True)
     # note: the main branch in conduit was renamed to develop, this next entry
diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py
index f2734e2a93..29f2300ea7 100644
--- a/var/spack/repos/builtin/packages/darshan-runtime/package.py
+++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py
@@ -21,6 +21,7 @@ class DarshanRuntime(AutotoolsPackage):
 
     maintainers = ['shanedsnyder', 'carns']
 
+    tags = ['e4s']
     test_requires_compiler = True
 
     version('main', branch='main', submodules=True)
diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py
index 1e54a57875..511cfa3993 100644
--- a/var/spack/repos/builtin/packages/darshan-util/package.py
+++ b/var/spack/repos/builtin/packages/darshan-util/package.py
@@ -18,6 +18,8 @@ class DarshanUtil(AutotoolsPackage):
 
     maintainers = ['shanedsnyder', 'carns']
 
+    tags = ['e4s']
+
     version('main', branch='main', submodules='True')
     version('3.3.1', sha256='281d871335977d0592a49d053df93d68ce1840f6fdec27fea7a59586a84395f7')
     version('3.3.0', sha256='2e8bccf28acfa9f9394f2084ec18122c66e45d966087fa2e533928e824fcb57a')
diff --git a/var/spack/repos/builtin/packages/datatransferkit/package.py b/var/spack/repos/builtin/packages/datatransferkit/package.py
index 42698cc172..aced3fcdff 100644
--- a/var/spack/repos/builtin/packages/datatransferkit/package.py
+++ b/var/spack/repos/builtin/packages/datatransferkit/package.py
@@ -14,6 +14,8 @@ class Datatransferkit(CMakePackage):
     url      = "https://github.com/ORNL-CEES/DataTransferKit/archive/3.1-rc2.tar.gz"
     git      = "https://github.com/ORNL-CEES/DataTransferKit.git"
 
+    tags = ['e4s']
+
     maintainers = ['Rombur']
 
     version('master', branch='master', submodules=True)
diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py
index 38c664d500..6e313c25f9 100644
--- a/var/spack/repos/builtin/packages/dyninst/package.py
+++ b/var/spack/repos/builtin/packages/dyninst/package.py
@@ -16,6 +16,8 @@ class Dyninst(CMakePackage):
     git      = "https://github.com/dyninst/dyninst.git"
     maintainers = ['hainest']
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('11.0.1', tag='v11.0.1')
     version('11.0.0', tag='v11.0.0')
diff --git a/var/spack/repos/builtin/packages/faodel/package.py b/var/spack/repos/builtin/packages/faodel/package.py
index 047ea71875..62edbc583c 100644
--- a/var/spack/repos/builtin/packages/faodel/package.py
+++ b/var/spack/repos/builtin/packages/faodel/package.py
@@ -15,6 +15,8 @@ class Faodel(CMakePackage):
 
     maintainers = ['tkordenbrock', 'craigulmer']
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('1.1906.1', sha256='4b3caf469ae7db50e9bb8d652e4cb532d33d474279def0f8a483f69385648058')
     version('1.1811.2', sha256='22feb502dad0f56fb8af492f6e2cdc53a97fd6c31f6fa3c655be0a6266c46996')
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py
index e7cee1bf74..899188fe6b 100644
--- a/var/spack/repos/builtin/packages/flecsi/package.py
+++ b/var/spack/repos/builtin/packages/flecsi/package.py
@@ -21,6 +21,8 @@ class Flecsi(CMakePackage, CudaPackage):
     git      = 'https://github.com/flecsi/flecsi.git'
     maintainers = ['rspavel', 'ktsai7']
 
+    tags = ['e4s']
+
     version('develop', branch='devel', submodules=False)
     version('1', git="https://github.com/laristra/flecsi.git", branch='1', submodules=False, preferred=False)
     version('1.4', git="https://github.com/laristra/flecsi.git",  branch='1.4', submodules=False, preferred=False)
diff --git a/var/spack/repos/builtin/packages/flit/package.py b/var/spack/repos/builtin/packages/flit/package.py
index 6cd035f3b4..8fcaef136c 100644
--- a/var/spack/repos/builtin/packages/flit/package.py
+++ b/var/spack/repos/builtin/packages/flit/package.py
@@ -16,6 +16,8 @@ class Flit(MakefilePackage):
     url      = "https://github.com/PRUNERS/FLiT"
     url      = "https://github.com/PRUNERS/FLiT/archive/v2.1.0.tar.gz"
 
+    tags = ['e4s']
+
     version('2.1.0', sha256='b31ffa02fda1ab0f5555acdc6edc353d93d53ae8ef85e099f83bcf1c83e70885')
 
     maintainers = ['mikebentley15']
diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py
index 0c8558b407..ad95d5a019 100644
--- a/var/spack/repos/builtin/packages/flux-core/package.py
+++ b/var/spack/repos/builtin/packages/flux-core/package.py
@@ -14,7 +14,7 @@ class FluxCore(AutotoolsPackage):
     homepage = "https://github.com/flux-framework/flux-core"
     url      = "https://github.com/flux-framework/flux-core/releases/download/v0.8.0/flux-core-0.8.0.tar.gz"
     git      = "https://github.com/flux-framework/flux-core.git"
-    tags     = ['radiuss']
+    tags     = ['radiuss', 'e4s']
 
     maintainers = ['SteVwonder']
 
diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py
index 1d6edcdb3f..2857a58ea7 100644
--- a/var/spack/repos/builtin/packages/flux-sched/package.py
+++ b/var/spack/repos/builtin/packages/flux-sched/package.py
@@ -14,7 +14,7 @@ class FluxSched(AutotoolsPackage):
     homepage = "https://github.com/flux-framework/flux-sched"
     url      = "https://github.com/flux-framework/flux-sched/releases/download/v0.5.0/flux-sched-0.5.0.tar.gz"
     git      = "https://github.com/flux-framework/flux-sched.git"
-    tags     = ['radiuss']
+    tags     = ['radiuss', 'e4s']
 
     maintainers = ['SteVwonder']
 
diff --git a/var/spack/repos/builtin/packages/fortrilinos/package.py b/var/spack/repos/builtin/packages/fortrilinos/package.py
index 3e13fe156e..61654e96ca 100644
--- a/var/spack/repos/builtin/packages/fortrilinos/package.py
+++ b/var/spack/repos/builtin/packages/fortrilinos/package.py
@@ -29,6 +29,7 @@ class Fortrilinos(CMakePackage):
 
     maintainers = ['sethrj', 'aprokop']
 
+    tags = ['e4s']
     test_requires_compiler = True
 
     version('2.0.0', sha256='9af3b3eea9934e44d74654a5fa822de08bd0efa43e06e4a4e35a777781f542d6')
diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py
index 0b7f9df506..ef3827dab1 100644
--- a/var/spack/repos/builtin/packages/gasnet/package.py
+++ b/var/spack/repos/builtin/packages/gasnet/package.py
@@ -30,6 +30,8 @@ class Gasnet(Package):
 
     maintainers = ['PHHargrove', 'bonachea']
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('main',    branch='stable')
     version('master',  branch='master')
diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py
index ca0d2e8c0f..453389a937 100644
--- a/var/spack/repos/builtin/packages/geopm/package.py
+++ b/var/spack/repos/builtin/packages/geopm/package.py
@@ -20,6 +20,8 @@ class Geopm(AutotoolsPackage):
     url      = "https://github.com/geopm/geopm/releases/download/v1.0.0/geopm-1.0.0.tar.gz"
     git      = "https://github.com/geopm/geopm.git"
 
+    tags = ['e4s']
+
     # Add additional proper versions and checksums here. "spack checksum geopm"
     version('develop', branch='dev')
     version('master', branch='master')
diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py
index 59a3f17c1e..4518f3cce1 100644
--- a/var/spack/repos/builtin/packages/ginkgo/package.py
+++ b/var/spack/repos/builtin/packages/ginkgo/package.py
@@ -17,6 +17,8 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage):
 
     maintainers = ['tcojean', 'hartwiganzt']
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('master', branch='master')
     version('1.4.0', commit='f811917c1def4d0fcd8db3fe5c948ce13409e28e')  # v1.4.0
diff --git a/var/spack/repos/builtin/packages/globalarrays/package.py b/var/spack/repos/builtin/packages/globalarrays/package.py
index 364383456c..167bbc50d5 100644
--- a/var/spack/repos/builtin/packages/globalarrays/package.py
+++ b/var/spack/repos/builtin/packages/globalarrays/package.py
@@ -17,6 +17,8 @@ class Globalarrays(AutotoolsPackage):
     homepage = "https://hpc.pnl.gov/globalarrays/"
     url = "https://github.com/GlobalArrays/ga/releases/download/v5.7/ga-5.7.tar.gz"
 
+    tags = ['e4s']
+
     version('5.8',   sha256='64df7d1ea4053d24d84ca361e67a6f51c7b17ed7d626cb18a9fbc759f4a078ac')
     version('5.7.2', sha256='8cd0fcfd85bc7f9c168c831616f66f1e8b9b2ca31dc7dd93cc55b27cc7fe7069')
     version('5.7.1', sha256='aa4c6038d792cabf1766e264320da58a555da81a3a36be32b7c4d3e71c08ffa9')
diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py
index 941496b3d1..4d69ce458a 100644
--- a/var/spack/repos/builtin/packages/gotcha/package.py
+++ b/var/spack/repos/builtin/packages/gotcha/package.py
@@ -13,6 +13,8 @@ class Gotcha(CMakePackage):
     homepage = "https://github.com/LLNL/gotcha"
     git      = "https://github.com/LLNL/gotcha.git"
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('master', branch='master')
     version('1.0.3', tag='1.0.3')
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
index 13a4f0746f..f822797c3e 100644
--- a/var/spack/repos/builtin/packages/hdf5/package.py
+++ b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -24,6 +24,8 @@ class Hdf5(CMakePackage):
     maintainers = ['lrknox', 'brtnfld', 'byrnHDF', 'ChristopherHogan', 'epourmal',
                    'gheber', 'hyoklee', 'lkurz', 'soumagne']
 
+    tags = ['e4s']
+
     test_requires_compiler = True
 
     # The 'develop' version is renamed so that we could uninstall (or patch) it
diff --git a/var/spack/repos/builtin/packages/heffte/package.py b/var/spack/repos/builtin/packages/heffte/package.py
index 85eb8a6ced..4516ba7ddd 100644
--- a/var/spack/repos/builtin/packages/heffte/package.py
+++ b/var/spack/repos/builtin/packages/heffte/package.py
@@ -14,6 +14,7 @@ class Heffte(CMakePackage, CudaPackage, ROCmPackage):
     git      = "https://bitbucket.org/icl/heffte.git"
 
     maintainers = ['mkstoyanov']
+    tags = ['e4s']
 
     test_requires_compiler = True
 
diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py
index e0bfe50332..3472237097 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py
@@ -18,6 +18,8 @@ class Hpctoolkit(AutotoolsPackage):
     git      = "https://github.com/HPCToolkit/hpctoolkit.git"
     maintainers = ['mwkrentel']
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('master',  branch='master')
     version('2021.05.15', commit='004ea0c2aea6a261e7d5d216c24f8a703fc6c408')
diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py
index 7767744b42..9f44cd8828 100644
--- a/var/spack/repos/builtin/packages/hpx/package.py
+++ b/var/spack/repos/builtin/packages/hpx/package.py
@@ -16,6 +16,8 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage):
     url = "https://github.com/STEllAR-GROUP/hpx/archive/1.2.1.tar.gz"
     maintainers = ['msimberg', 'albestro', 'teonnik']
 
+    tags = ['e4s']
+
     version('master', git='https://github.com/STEllAR-GROUP/hpx.git', branch='master')
     version('stable', git='https://github.com/STEllAR-GROUP/hpx.git', tag='stable')
     version('1.7.1', sha256='008a0335def3c551cba31452eda035d7e914e3e4f77eec679eea070ac71bd83b')
diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index c82e3da9b5..e2e633301f 100644
--- a/var/spack/repos/builtin/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
@@ -21,6 +21,8 @@ class Hypre(Package, CudaPackage):
 
     maintainers = ['ulrikeyang', 'osborn9', 'balay']
 
+    tags = ['e4s']
+
     test_requires_compiler = True
 
     version('develop', branch='master')
diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/package.py b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
index fd8546910f..2f8011825d 100644
--- a/var/spack/repos/builtin/packages/kokkos-kernels/package.py
+++ b/var/spack/repos/builtin/packages/kokkos-kernels/package.py
@@ -13,6 +13,8 @@ class KokkosKernels(CMakePackage, CudaPackage):
     git = "https://github.com/kokkos/kokkos-kernels.git"
     url = "https://github.com/kokkos/kokkos-kernels/archive/3.1.00.tar.gz"
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('master',  branch='master')
     version('3.2.00', sha256="8ac20ee28ae7813ce1bda461918800ad57fdbac2af86ef5d1ba74e83e10956de")
diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py
index abbcd8ec84..692226cae8 100644
--- a/var/spack/repos/builtin/packages/kokkos/package.py
+++ b/var/spack/repos/builtin/packages/kokkos/package.py
@@ -15,6 +15,8 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
     git = "https://github.com/kokkos/kokkos.git"
     url      = "https://github.com/kokkos/kokkos/archive/3.4.01.tar.gz"
 
+    tags = ['e4s']
+
     test_requires_compiler = True
 
     maintainers = ['DavidPoliakoff', 'jciesko']
diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py
index fd8bb0c4f0..f27568dab6 100644
--- a/var/spack/repos/builtin/packages/legion/package.py
+++ b/var/spack/repos/builtin/packages/legion/package.py
@@ -26,7 +26,7 @@ class Legion(CMakePackage):
     git = "https://github.com/StanfordLegion/legion.git"
 
     maintainers = ['pmccormick', 'streichler']
-
+    tags = ['e4s']
     version('21.03.0', tag='legion-21.03.0')
     version('stable', branch='stable')
     version('master', branch='master')
diff --git a/var/spack/repos/builtin/packages/libnrm/package.py b/var/spack/repos/builtin/packages/libnrm/package.py
index 13a9e1dc65..cc84c4f8b6 100644
--- a/var/spack/repos/builtin/packages/libnrm/package.py
+++ b/var/spack/repos/builtin/packages/libnrm/package.py
@@ -14,6 +14,8 @@ class Libnrm(AutotoolsPackage):
     url = "https://www.mcs.anl.gov/research/projects/argo/downloads/libnrm-0.1.0.tar.gz"
     version('0.1.0', sha256='f849ada384025fa41251acc2a43aa335e0cb1b9cd1c8ab8b9d1808a036ae551e')
 
+    tags = ['e4s']
+
     depends_on('m4', type='build')
     depends_on('autoconf', type='build')
     depends_on('automake', type='build')
diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py
index c199e15c99..0ec586bb63 100644
--- a/var/spack/repos/builtin/packages/libquo/package.py
+++ b/var/spack/repos/builtin/packages/libquo/package.py
@@ -17,6 +17,8 @@ class Libquo(AutotoolsPackage):
 
     maintainers = ['samuelkgutierrez']
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('1.3.1', sha256='407f7c61cc80aa934cf6086f3516a31dee3b803047713c297102452c3d7d6ed1')
     version('1.3',   sha256='61b0beff15eae4be94b5d3cbcbf7bf757659604465709ed01827cbba45efcf90')
diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py
index a357edd5f8..5e5412be2e 100644
--- a/var/spack/repos/builtin/packages/llvm-doe/package.py
+++ b/var/spack/repos/builtin/packages/llvm-doe/package.py
@@ -20,6 +20,7 @@ class LlvmDoe(CMakePackage, CudaPackage):
     url = "https://github.com/llvm-doe-org/llvm-project/archive/llvmorg-10.0.0.zip"
     git = "https://github.com/llvm-doe-org/llvm-project"
     maintainers = ['shintaro-iwasaki']
+    tags = ['e4s']
 
     version('doe', branch='doe', preferred=True)
     version('upstream', branch='llvm.org/main')
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index c3e4427603..66eba92721 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -25,6 +25,8 @@ class Llvm(CMakePackage, CudaPackage):
     git = "https://github.com/llvm/llvm-project"
     maintainers = ['trws', 'naromero77']
 
+    tags = ['e4s']
+
     family = "compiler"  # Used by lmod
 
     # fmt: off
diff --git a/var/spack/repos/builtin/packages/loki/package.py b/var/spack/repos/builtin/packages/loki/package.py
index 5052d9a7d9..39b5ff16d7 100644
--- a/var/spack/repos/builtin/packages/loki/package.py
+++ b/var/spack/repos/builtin/packages/loki/package.py
@@ -12,6 +12,7 @@ class Loki(MakefilePackage):
 
     homepage = "http://loki-lib.sourceforge.net"
     url      = "https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-0.1.7.tar.bz2"
+    tags = ['e4s']
 
     version('0.1.7', sha256='07553754f6be2738559947db69b0718512665bf4a34015fa3a875b6eb1111198')
 
diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py
index 346797bd3b..2b788582c3 100644
--- a/var/spack/repos/builtin/packages/magma/package.py
+++ b/var/spack/repos/builtin/packages/magma/package.py
@@ -18,6 +18,8 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage):
     url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz"
     maintainers = ['stomov', 'luszczek', 'G-Ragghianti']
 
+    tags = ['e4s']
+
     test_requires_compiler = True
 
     version('master', branch='master')
diff --git a/var/spack/repos/builtin/packages/mercury/package.py b/var/spack/repos/builtin/packages/mercury/package.py
index 3b348aeaeb..e3a76d0ecf 100644
--- a/var/spack/repos/builtin/packages/mercury/package.py
+++ b/var/spack/repos/builtin/packages/mercury/package.py
@@ -13,7 +13,7 @@ class Mercury(CMakePackage):
     git = 'https://github.com/mercury-hpc/mercury.git'
 
     maintainers = ['soumagne']
-
+    tags = ['e4s']
     version('master', branch='master', submodules=True)
     version('2.0.1', sha256='335946d9620ac669643ffd9861a5fb3ee486834bab674b7779eaac9d6662e3fa')
     version('2.0.0', sha256='9e80923712e25df56014309df70660e828dbeabbe5fcc82ee024bcc86e7eb6b7')
diff --git a/var/spack/repos/builtin/packages/metall/package.py b/var/spack/repos/builtin/packages/metall/package.py
index 1409f173d4..5446f9b0a5 100644
--- a/var/spack/repos/builtin/packages/metall/package.py
+++ b/var/spack/repos/builtin/packages/metall/package.py
@@ -13,6 +13,8 @@ class Metall(CMakePackage):
 
     maintainers = ['KIwabuchi', 'rogerpearce', 'mayagokhale']
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('develop', branch='develop')
 
diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py
index b524e56639..ebd8c2cbaf 100644
--- a/var/spack/repos/builtin/packages/mfem/package.py
+++ b/var/spack/repos/builtin/packages/mfem/package.py
@@ -13,7 +13,7 @@ from spack import *
 class Mfem(Package, CudaPackage, ROCmPackage):
     """Free, lightweight, scalable C++ library for finite element methods."""
 
-    tags = ['fem', 'finite-elements', 'high-order', 'amr', 'hpc', 'radiuss']
+    tags = ['fem', 'finite-elements', 'high-order', 'amr', 'hpc', 'radiuss', 'e4s']
 
     homepage = 'http://www.mfem.org'
     git      = 'https://github.com/mfem/mfem.git'
diff --git a/var/spack/repos/builtin/packages/mpark-variant/package.py b/var/spack/repos/builtin/packages/mpark-variant/package.py
index b18b54e635..2faa17455e 100644
--- a/var/spack/repos/builtin/packages/mpark-variant/package.py
+++ b/var/spack/repos/builtin/packages/mpark-variant/package.py
@@ -14,6 +14,8 @@ class MparkVariant(CMakePackage):
     git      = "https://github.com/mpark/variant.git"
     maintainers = ['ax3l']
 
+    tags = ['e4s']
+
     version('1.4.0', sha256='8f6b28ab3640b5d76d5b6664dda7257a4405ce59179220431b8fd196c79b2ecb')
     version('1.3.0', sha256='d0f7e41f818fcc839797a8017e76b8b66b323651c304cff641a83a56ae9943c6')
 
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index bbf2681b27..cae3ea70af 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -21,7 +21,7 @@ class Mpich(AutotoolsPackage):
     list_depth = 1
 
     maintainers = ['raffenet', 'yfguo']
-
+    tags = ['e4s']
     executables = ['^mpichversion$']
 
     version('develop', submodules=True)
diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py
index 6385f9270e..c3d03b789d 100644
--- a/var/spack/repos/builtin/packages/mpifileutils/package.py
+++ b/var/spack/repos/builtin/packages/mpifileutils/package.py
@@ -20,6 +20,8 @@ class Mpifileutils(Package):
     url      = "https://github.com/hpc/mpifileutils/archive/v0.9.tar.gz"
     git      = "https://github.com/hpc/mpifileutils.git"
 
+    tags = ['e4s']
+
     version('develop', branch='master')
     version('0.11',   sha256='f5dc1b39077b3c04f79b2c335c4fd80306f8c57ecfbcacbb82cf532caf02b5fd')
     version('0.10.1', sha256='4c8409ef4140f6f557d0e93f0c1267baf5d893c203b29fb7a33d9bc3c5a5d25c')
diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
index 2605deaadd..c0ba649553 100644
--- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py
+++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
@@ -107,6 +107,7 @@ class NetlibScalapack(ScalapackBase):
 
     homepage = "https://www.netlib.org/scalapack/"
     url = "https://www.netlib.org/scalapack/scalapack-2.0.2.tgz"
+    tags = ['e4s']
 
     version('2.1.0', sha256='61d9216cf81d246944720cfce96255878a3f85dec13b9351f1fa0fd6768220a6')
     version('2.0.2', sha256='0c74aeae690fe5ee4db7926f49c5d0bb69ce09eea75beb915e00bba07530395c')
diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py
index a354d9d254..a74a6f2c1c 100644
--- a/var/spack/repos/builtin/packages/ninja/package.py
+++ b/var/spack/repos/builtin/packages/ninja/package.py
@@ -16,6 +16,8 @@ class Ninja(Package):
 
     executables = ['^ninja$']
 
+    tags = ['e4s']
+
     version('kitware', branch='features-for-fortran', git='https://github.com/Kitware/ninja.git')
     version('master', branch='master')
     version('1.10.2', sha256='ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed')
diff --git a/var/spack/repos/builtin/packages/nvhpc/package.py b/var/spack/repos/builtin/packages/nvhpc/package.py
index c4c51ff55c..dc5876f7eb 100644
--- a/var/spack/repos/builtin/packages/nvhpc/package.py
+++ b/var/spack/repos/builtin/packages/nvhpc/package.py
@@ -77,6 +77,7 @@ class Nvhpc(Package):
     homepage = "https://developer.nvidia.com/hpc-sdk"
 
     maintainers = ['samcmill']
+    tags = ['e4s']
 
     for ver, packages in _versions.items():
         key = "{0}-{1}".format(platform.system(), platform.machine())
diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py
index f2d6235dad..41872a53ed 100644
--- a/var/spack/repos/builtin/packages/omega-h/package.py
+++ b/var/spack/repos/builtin/packages/omega-h/package.py
@@ -16,7 +16,7 @@ class OmegaH(CMakePackage):
     git      = "https://github.com/SNLComputation/omega_h.git"
 
     maintainers = ['ibaned']
-
+    tags = ['e4s']
     version('main', branch='main')
     version('9.34.1', sha256='3a812da3b8df3e0e5d78055e91ad23333761bcd9ed9b2c8c13ee1ba3d702e46c')
     version('9.32.5', sha256='963a203e9117024cd48d829d82b8543cd9133477fdc15386113b594fdc3246d8')
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index 10ccc3a11f..95ba25ca18 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -34,6 +34,8 @@ class Openmpi(AutotoolsPackage):
 
     executables = ['^ompi_info$']
 
+    tags = ['e4s']
+
     version('master', branch='master', submodules=True)
 
     # Current
diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py
index 48b8f9187c..e1ce714245 100644
--- a/var/spack/repos/builtin/packages/openpmd-api/package.py
+++ b/var/spack/repos/builtin/packages/openpmd-api/package.py
@@ -15,6 +15,8 @@ class OpenpmdApi(CMakePackage):
 
     maintainers = ['ax3l']
 
+    tags = ['e4s']
+
     # C++14 up until here
     version('develop', branch='dev')
     version('0.14.2', sha256='25c6b4bcd0ae1ba668b633b8514e66c402da54901c26861fc754fca55717c836')
diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py
index 700ba9e21d..a71251aa7b 100644
--- a/var/spack/repos/builtin/packages/papi/package.py
+++ b/var/spack/repos/builtin/packages/papi/package.py
@@ -22,6 +22,8 @@ class Papi(AutotoolsPackage):
     homepage = "https://icl.cs.utk.edu/papi/index.html"
     maintainers = ['G-Ragghianti']
 
+    tags = ['e4s']
+
     url = "https://icl.cs.utk.edu/projects/papi/downloads/papi-5.4.1.tar.gz"
     git = "https://bitbucket.org/icl/papi/src/master/"
 
diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py
index e5f17e6562..a132cecba7 100644
--- a/var/spack/repos/builtin/packages/papyrus/package.py
+++ b/var/spack/repos/builtin/packages/papyrus/package.py
@@ -15,6 +15,8 @@ class Papyrus(CMakePackage):
     url      = "https://code.ornl.gov/eck/papyrus/repository/archive.tar.bz2?ref=v1.0.2"
     git      = "https://code.ornl.gov/eck/papyrus.git"
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('1.0.2', sha256='b6cfcff99f73ded8e4ca4b165bc182cd5cac60f0c0cf4f93649b77d074445645')
     version('1.0.1', sha256='3772fd6f2c301faf78f18c5e4dc3dbac57eb361861b091579609b3fff9e0bb17')
diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py
index 0122b3707c..a9ec5fd8d7 100644
--- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py
+++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py
@@ -21,6 +21,8 @@ class ParallelNetcdf(AutotoolsPackage):
 
     maintainers = ['skosukhin']
 
+    tags = ['e4s']
+
     test_requires_compiler = True
 
     def url_for_version(self, version):
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py
index b6122441ee..4ee8f7b8c7 100644
--- a/var/spack/repos/builtin/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@@ -20,6 +20,7 @@ class Paraview(CMakePackage, CudaPackage):
     git      = "https://gitlab.kitware.com/paraview/paraview.git"
 
     maintainers = ['chuckatkins', 'danlipsa', 'vicentebolea']
+    tags = ['e4s']
 
     version('master', branch='master', submodules=True)
     version('5.9.1', sha256='0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d', preferred=True)
diff --git a/var/spack/repos/builtin/packages/parsec/package.py b/var/spack/repos/builtin/packages/parsec/package.py
index 014b8e0256..3d8e47a4f5 100644
--- a/var/spack/repos/builtin/packages/parsec/package.py
+++ b/var/spack/repos/builtin/packages/parsec/package.py
@@ -20,6 +20,7 @@ class Parsec(CMakePackage, CudaPackage):
     url         = "https://bitbucket.org/icldistcomp/parsec/get/parsec-3.0.2012.tar.bz2"
     list_url    = "https://bitbucket.org/icldistcomp/parsec/downloads/?tab=tags"
     maintainers = ['abouteiller', 'bosilca', 'herault']
+    tags = ['e4s']
 
     test_requires_compiler = True
 
diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py
index f643b81f60..c3b02dccac 100644
--- a/var/spack/repos/builtin/packages/pdt/package.py
+++ b/var/spack/repos/builtin/packages/pdt/package.py
@@ -21,6 +21,8 @@ class Pdt(AutotoolsPackage):
     homepage = "https://www.cs.uoregon.edu/research/pdt/home.php"
     url      = "https://www.cs.uoregon.edu/research/paracomp/pdtoolkit/Download/pdtoolkit-3.25.1.tar.gz"
 
+    tags = ['e4s']
+
     version('3.25.1', sha256='0b6f8a6b8769c181b2ae6cae7298f04b8e3e3d68066f598ed24574e19500bc97')
     version('3.25', sha256='1037628d854edfeded3d847150d3e8fbd3774e8146407ce32f5021c80f6299be')
     version('3.24', sha256='4a2bb31f3f7f2e52ed49d9b7189ade05170a4386ef76771280a06e8b3ca97ab2')
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 738d8b73d7..ca5aa3433a 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -16,6 +16,8 @@ class Petsc(Package, CudaPackage, ROCmPackage):
     git = "https://gitlab.com/petsc/petsc.git"
     maintainers = ['balay', 'barrysmith', 'jedbrown']
 
+    tags = ['e4s']
+
     version('main', branch='main')
 
     version('3.15.4', sha256='1e62fb0859a12891022765d1e24660cfcd704291c58667082d81a0618d6b0047')
diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py
index 80f6436072..4c4ddfad1c 100644
--- a/var/spack/repos/builtin/packages/phist/package.py
+++ b/var/spack/repos/builtin/packages/phist/package.py
@@ -24,6 +24,7 @@ class Phist(CMakePackage):
     git      = "https://bitbucket.org/essex/phist.git"
 
     maintainers = ['jthies']
+    tags = ['e4s']
 
     version('develop', branch='devel')
     version('master', branch='master')
diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py
index 7e263dccdb..cc8fb62ca5 100644
--- a/var/spack/repos/builtin/packages/plasma/package.py
+++ b/var/spack/repos/builtin/packages/plasma/package.py
@@ -20,6 +20,8 @@ class Plasma(CMakePackage):
     git = "https://github.com/icl-utk-edu/plasma"
     maintainers = ['luszczek']
 
+    tags = ['e4s']
+
     version("develop", git=git)
     version('21.8.29', sha256='e0bb4d9143c8540f9f46cbccac9ed0cbea12500a864e6954fce2fe94ea057a10')
     version("20.9.20", sha256="2144a77b739f8dd2f0dbe5b64d94cde0e916f55c4eb170facd168c0db7fc7970")
diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py
index 742205000b..d6a3f33d22 100644
--- a/var/spack/repos/builtin/packages/precice/package.py
+++ b/var/spack/repos/builtin/packages/precice/package.py
@@ -18,6 +18,8 @@ class Precice(CMakePackage):
     url      = 'https://github.com/precice/precice/archive/v1.2.0.tar.gz'
     maintainers = ['fsimonis', 'MakisH']
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('2.2.1', sha256='bca8cedfb5c86656e4fdfaca5cb982b861f9aba926538fa4411bc0d015e09c1f')
     version('2.2.0', sha256='f8c4e0810dcaeb6a40a0fcab64b95c899f0121c968e0730416d4d2a97d39d0c4')
diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py
index 7a732b9958..69356d74b8 100644
--- a/var/spack/repos/builtin/packages/pumi/package.py
+++ b/var/spack/repos/builtin/packages/pumi/package.py
@@ -21,9 +21,11 @@ class Pumi(CMakePackage):
 
     maintainers = ['cwsmith']
 
+    tags = ['e4s']
+
     # We will use the scorec/core master branch as the 'nightly' version
     # of pumi in spack.  The master branch is more stable than the
-    # scorec/core develop branch and we perfer not to expose spack users
+    # scorec/core develop branch and we prefer not to expose spack users
     # to the added instability.
     version('master', submodules=True, branch='master')
     version('2.2.6', commit='4dd330e960b1921ae0d8d4039b8de8680a20d993')  # tag 2.2.6
diff --git a/var/spack/repos/builtin/packages/py-cinemasci/package.py b/var/spack/repos/builtin/packages/py-cinemasci/package.py
index 3f70f82850..36a67544b7 100644
--- a/var/spack/repos/builtin/packages/py-cinemasci/package.py
+++ b/var/spack/repos/builtin/packages/py-cinemasci/package.py
@@ -13,6 +13,8 @@ class PyCinemasci(PythonPackage):
     homepage = "https://github.com/cinemascience"
     pypi = "cinemasci/cinemasci-1.3.tar.gz"
 
+    tags = ['e4s']
+
     maintainers = ['EthanS94']
 
     version('1.3', sha256='c024ca9791de9d78e5dad3fd11e8f87d8bc1afa5830f2697d7ec4116a5d23c20')
diff --git a/var/spack/repos/builtin/packages/py-jupyterhub/package.py b/var/spack/repos/builtin/packages/py-jupyterhub/package.py
index 2e07238ac6..d91aeb487c 100644
--- a/var/spack/repos/builtin/packages/py-jupyterhub/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyterhub/package.py
@@ -11,6 +11,8 @@ class PyJupyterhub(PythonPackage):
 
     pypi = "jupyterhub/jupyterhub-1.0.0.tar.gz"
 
+    tags = ['e4s']
+
     version('1.4.1',    sha256='ee1b0718a4db8e0b339796e3e50b704ca6822ab22a7435289dbb5932f65b5199')
     version('1.0.0',    sha256='33541a515a041b9a518ca057c1c4ab4215a7450fdddc206401713ee8137fa67f')
     version('0.9.4',    sha256='7848bbb299536641a59eb1977ec3c7c95d931bace4a2803d7e9b28b9256714da')
diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py
index bbc24170db..6d7fefa665 100644
--- a/var/spack/repos/builtin/packages/py-libensemble/package.py
+++ b/var/spack/repos/builtin/packages/py-libensemble/package.py
@@ -15,6 +15,8 @@ class PyLibensemble(PythonPackage):
     git = "https://github.com/Libensemble/libensemble.git"
     maintainers = ['shuds13']
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('0.7.2', sha256='69b64304d1ecce4d57687ea6062f89bd813ae93b2a290bb1f595c5626ab6f197')
     version('0.7.1', sha256='5cb294269624c1284ea25be9ed3bc668a2333e21e97a97b57ad339eb85435e46')
diff --git a/var/spack/repos/builtin/packages/py-warpx/package.py b/var/spack/repos/builtin/packages/py-warpx/package.py
index 8c3f6d9538..ec37f1afb1 100644
--- a/var/spack/repos/builtin/packages/py-warpx/package.py
+++ b/var/spack/repos/builtin/packages/py-warpx/package.py
@@ -23,6 +23,8 @@ class PyWarpx(PythonPackage):
 
     maintainers = ['ax3l', 'dpgrote', 'RemiLehe']
 
+    tags = ['e4s']
+
     # NOTE: if you update the versions here, also see warpx
     version('develop', branch='development')
     version('21.09', sha256='861a65f11846541c803564db133c8678b9e8779e69902ef1637b21399d257eab')
diff --git a/var/spack/repos/builtin/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py
index 1ef735f7eb..2a5b2ed5ec 100644
--- a/var/spack/repos/builtin/packages/qthreads/package.py
+++ b/var/spack/repos/builtin/packages/qthreads/package.py
@@ -33,6 +33,8 @@ class Qthreads(AutotoolsPackage):
     test_base_path = 'test/basics/'
     test_list = ['hello_world_multi', 'hello_world']
 
+    tags = ['e4s']
+
     version('1.16', sha256='0a95e20b08cb486de6c33bff16590f41e444ca64ab738aee697ef982fbb021d8')
     version('1.15', sha256='3ac2dc24debff004a2998933de5724b1e14e1ae262fa9942acbb01f77819a23b')
     version("1.14", sha256="16f15e5b2e35b6329a857d24c283a1e43cd49921ee49a1446d4f31bf9c6f5cf9")
diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py
index 70d86e1708..dc2a2440cb 100644
--- a/var/spack/repos/builtin/packages/raja/package.py
+++ b/var/spack/repos/builtin/packages/raja/package.py
@@ -13,7 +13,7 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     homepage = "https://software.llnl.gov/RAJA/"
     git      = "https://github.com/LLNL/RAJA.git"
-    tags     = ['radiuss']
+    tags     = ['radiuss', 'e4s']
 
     maintainers = ['davidbeckingsale']
 
diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py
index 5ad3dcc0fb..4e80351ac3 100644
--- a/var/spack/repos/builtin/packages/rempi/package.py
+++ b/var/spack/repos/builtin/packages/rempi/package.py
@@ -10,6 +10,7 @@ class Rempi(AutotoolsPackage):
     """ReMPI is a record-and-replay tool for MPI applications."""
     homepage = "https://github.com/PRUNERS/ReMPI"
     url      = "https://github.com/PRUNERS/ReMPI/releases/download/v1.0.0/ReMPI-1.0.0.tar.gz"
+    tags     = ['e4s']
 
     version("1.1.0", sha256="4fd94fca52311fd19dc04a32547841e6c1c1656b7999b2f76f537d6ec24efccc")
     version("1.0.0", sha256="1cb21f457cf8a04632150156a2ba699dd0c3f81d47e8881a9b943b9bf575fa01")
diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py
index cc6e13761f..a34865c792 100644
--- a/var/spack/repos/builtin/packages/scr/package.py
+++ b/var/spack/repos/builtin/packages/scr/package.py
@@ -27,6 +27,8 @@ class Scr(CMakePackage):
     git      = "https://github.com/llnl/scr.git"
     tags     = ['radiuss']
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('legacy', branch='legacy', deprecated=True)
 
diff --git a/var/spack/repos/builtin/packages/slate/package.py b/var/spack/repos/builtin/packages/slate/package.py
index 08378ff7a9..9b43aa692e 100644
--- a/var/spack/repos/builtin/packages/slate/package.py
+++ b/var/spack/repos/builtin/packages/slate/package.py
@@ -20,6 +20,7 @@ class Slate(CMakePackage, CudaPackage, ROCmPackage):
     url      = 'https://bitbucket.org/icl/slate/downloads/slate-2020.10.00.tar.gz'
     maintainers = ['G-Ragghianti', 'mgates3']
 
+    tags = ['e4s']
     test_requires_compiler = True
 
     version('master', branch='master')
diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py
index d6ab39e013..fa19e190af 100644
--- a/var/spack/repos/builtin/packages/slepc/package.py
+++ b/var/spack/repos/builtin/packages/slepc/package.py
@@ -18,6 +18,7 @@ class Slepc(Package, CudaPackage, ROCmPackage):
 
     maintainers = ['joseeroman', 'balay']
 
+    tags = ['e4s']
     test_requires_compiler = True
 
     version('main', branch='main')
diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py
index 0d9e8d452a..6133e37942 100644
--- a/var/spack/repos/builtin/packages/stc/package.py
+++ b/var/spack/repos/builtin/packages/stc/package.py
@@ -14,6 +14,8 @@ class Stc(AutotoolsPackage):
     url      = 'https://swift-lang.github.io/swift-t-downloads/spack/stc-0.9.0.tar.gz'
     git      = "https://github.com/swift-lang/swift-t.git"
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('0.9.0', sha256='edf187344ce860476473ab6599f042cd22ed029aa186d512135990accb9d260f')
     version('0.8.3', sha256='d61ca80137a955b12e84e41cb8a78ce1a58289241a2665076f12f835cf68d798')
diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py
index c761f5b922..51a83b2a44 100644
--- a/var/spack/repos/builtin/packages/strumpack/package.py
+++ b/var/spack/repos/builtin/packages/strumpack/package.py
@@ -23,6 +23,8 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage):
     url      = "https://github.com/pghysels/STRUMPACK/archive/v5.1.0.tar.gz"
     git      = "https://github.com/pghysels/STRUMPACK.git"
 
+    tags = ['e4s']
+
     maintainers = ['pghysels']
 
     test_requires_compiler = True
diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py
index 63f2f0c78f..2dc036317b 100644
--- a/var/spack/repos/builtin/packages/sundials/package.py
+++ b/var/spack/repos/builtin/packages/sundials/package.py
@@ -17,7 +17,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
     urls = ["https://computing.llnl.gov/projects/sundials/download/sundials-2.7.0.tar.gz",
             "https://github.com/LLNL/sundials/releases/download/v2.7.0/sundials-2.7.0.tar.gz"]
     git = "https://github.com/llnl/sundials.git"
-    tags = ['radiuss']
+    tags = ['radiuss', 'e4s']
 
     maintainers = ['cswoodward', 'gardner48', 'balos1']
 
diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py
index 8f4a9dc260..7c604bb809 100644
--- a/var/spack/repos/builtin/packages/superlu-dist/package.py
+++ b/var/spack/repos/builtin/packages/superlu-dist/package.py
@@ -14,6 +14,8 @@ class SuperluDist(CMakePackage, CudaPackage):
     url      = "https://github.com/xiaoyeli/superlu_dist/archive/v6.0.0.tar.gz"
     git      = "https://github.com/xiaoyeli/superlu_dist.git"
 
+    tags = ['e4s']
+
     maintainers = ['xiaoye', 'gchavez2', 'balay', 'pghysels']
 
     version('develop', branch='master')
diff --git a/var/spack/repos/builtin/packages/superlu/package.py b/var/spack/repos/builtin/packages/superlu/package.py
index 58081298be..bae7da2266 100644
--- a/var/spack/repos/builtin/packages/superlu/package.py
+++ b/var/spack/repos/builtin/packages/superlu/package.py
@@ -12,6 +12,8 @@ class Superlu(CMakePackage):
     homepage = "https://crd-legacy.lbl.gov/~xiaoye/SuperLU/#superlu"
     url      = "https://github.com/xiaoyeli/superlu/archive/refs/tags/v5.2.2.tar.gz"
 
+    tags = ['e4s']
+
     version('5.2.2', sha256='470334a72ba637578e34057f46948495e601a5988a602604f5576367e606a28c')
     version('5.2.1', sha256='28fb66d6107ee66248d5cf508c79de03d0621852a0ddeba7301801d3d859f463')
     version('4.3', sha256='169920322eb9b9c6a334674231479d04df72440257c17870aaa0139d74416781',
diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py
index f8cc55ea46..d0e41b82ab 100644
--- a/var/spack/repos/builtin/packages/swig/package.py
+++ b/var/spack/repos/builtin/packages/swig/package.py
@@ -22,6 +22,8 @@ class Swig(AutotoolsPackage, SourceforgePackage):
     sourceforge_mirror_path = "swig/swig-3.0.12.tar.gz"
     maintainers = ['sethrj']
 
+    tags = ['e4s']
+
     version('master', git='https://github.com/swig/swig.git')
     version('4.0.2', sha256='d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc',
             preferred=True)
diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py
index 9972aafbbe..b06e1c099d 100644
--- a/var/spack/repos/builtin/packages/sz/package.py
+++ b/var/spack/repos/builtin/packages/sz/package.py
@@ -14,6 +14,8 @@ class Sz(CMakePackage):
     git      = "https://github.com/szcompressor/sz"
     maintainers = ['disheng222', 'robertu94']
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('2.1.12', sha256='3712b2cd7170d1511569e48a208f02dfb72ecd7ad053c321e2880b9083e150de')
     version('2.1.11.1', sha256='e6fa5c969b012782b1e5e9fbd1cd7d1c0ace908d9ec982e78b2910ec5c2161ac')
diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py
index 2c6399e3d7..0fe517f6f2 100644
--- a/var/spack/repos/builtin/packages/tasmanian/package.py
+++ b/var/spack/repos/builtin/packages/tasmanian/package.py
@@ -15,6 +15,7 @@ class Tasmanian(CMakePackage, CudaPackage, ROCmPackage):
     url      = 'https://github.com/ORNL/TASMANIAN/archive/v7.5.tar.gz'
     git      = 'https://github.com/ORNL/TASMANIAN.git'
 
+    tags = ['e4s']
     maintainers = ['mkstoyanov']
 
     version('develop', branch='master')
diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py
index a7987a36c6..8c7b16426e 100644
--- a/var/spack/repos/builtin/packages/tau/package.py
+++ b/var/spack/repos/builtin/packages/tau/package.py
@@ -25,6 +25,8 @@ class Tau(Package):
     url      = "https://www.cs.uoregon.edu/research/tau/tau_releases/tau-2.30.tar.gz"
     git      = "https://github.com/UO-OACISS/tau2"
 
+    tags = ['e4s']
+
     version('master', branch='master')
     version('2.30.1', sha256='9c20ca1b4f4e80d885f24491cee598068871f0e9dd67906a5e47e4b4147d08fc')
     version('2.30', sha256='e581c33e21488d69839a00d97fd4451ea579f47249b2750d5c36bea773041eaf')
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 202658cbeb..96b425f276 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -33,6 +33,8 @@ class Trilinos(CMakePackage, CudaPackage):
 
     maintainers = ['keitat', 'sethrj', 'kuberry']
 
+    tags = ['e4s']
+
     # ###################### Versions ##########################
 
     version('master', branch='master')
diff --git a/var/spack/repos/builtin/packages/umap/package.py b/var/spack/repos/builtin/packages/umap/package.py
index 4d4fe5ed51..90e05540d1 100644
--- a/var/spack/repos/builtin/packages/umap/package.py
+++ b/var/spack/repos/builtin/packages/umap/package.py
@@ -15,6 +15,8 @@ class Umap(CMakePackage):
     url      = "https://github.com/LLNL/umap/archive/v2.1.0.tar.gz"
     git      = "https://github.com/LLNL/umap.git"
 
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('2.1.0', sha256='dfdc5b717aecdbfbb0da22e8567b9f2ffbc3607000a31122bf7c5ab3b85cecd9')
     version('2.0.0', sha256='85c4bc68e8790393847a84eb54eaf6fc321acade382a399a2679d541b0e34150')
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py
index 9580438b3c..b5f51b4e38 100644
--- a/var/spack/repos/builtin/packages/umpire/package.py
+++ b/var/spack/repos/builtin/packages/umpire/package.py
@@ -17,7 +17,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     homepage = 'https://github.com/LLNL/Umpire'
     git      = 'https://github.com/LLNL/Umpire.git'
-    tags     = ['radiuss']
+    tags     = ['radiuss', 'e4s']
 
     maintainers = ['davidbeckingsale']
 
diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py
index fd6eb4ae7b..7c7b655071 100644
--- a/var/spack/repos/builtin/packages/unifyfs/package.py
+++ b/var/spack/repos/builtin/packages/unifyfs/package.py
@@ -19,6 +19,8 @@ class Unifyfs(AutotoolsPackage):
     url      = "https://github.com/LLNL/UnifyFS/releases/download/v0.9.2/unifyfs-0.9.2.tar.gz"
     maintainers = ['CamStan']
 
+    tags = ['e4s']
+
     version('develop', branch='dev')
     version('0.9.2', sha256='7046625dc0677535f5d960187cb2e2d58a6f8cfb4dc6a3604f825257eb0891aa')
     version('0.9.1', sha256='2498a859cfa4961356fdf5c4c17e3afc3de7e034ad013b8c7145a622ef6199a0')
diff --git a/var/spack/repos/builtin/packages/upcxx/package.py b/var/spack/repos/builtin/packages/upcxx/package.py
index 5eadf1596d..af16447f1f 100644
--- a/var/spack/repos/builtin/packages/upcxx/package.py
+++ b/var/spack/repos/builtin/packages/upcxx/package.py
@@ -24,8 +24,10 @@ class Upcxx(Package):
 
     homepage = "https://upcxx.lbl.gov"
     maintainers = ['bonachea']
-
     git = 'https://bitbucket.org/berkeleylab/upcxx.git'
+
+    tags = ['e4s']
+
     version('develop', branch='develop')
     version('master',  branch='master')
 
diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py
index f9f5cf95dd..86bf79934b 100644
--- a/var/spack/repos/builtin/packages/veloc/package.py
+++ b/var/spack/repos/builtin/packages/veloc/package.py
@@ -14,7 +14,7 @@ class Veloc(CMakePackage):
     url      = "https://github.com/ECP-VeloC/VELOC/archive/1.5.tar.gz"
     git      = "https://github.com/ecp-veloc/veloc.git"
 
-    tags = ['ecp']
+    tags = ['e4s']
 
     version('master', branch='master')
     version('1.5', sha256='892f3623c73254d40fbbb8cbc3056219a31510e37aae2ede4100c04743701a5c')
diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py
index c08f464455..699ac21583 100644
--- a/var/spack/repos/builtin/packages/vtk-m/package.py
+++ b/var/spack/repos/builtin/packages/vtk-m/package.py
@@ -24,6 +24,7 @@ class VtkM(CMakePackage, CudaPackage):
 
     url      = "https://gitlab.kitware.com/vtk/vtk-m/-/archive/v1.5.1/vtk-m-v1.5.1.tar.gz"
     git      = "https://gitlab.kitware.com/vtk/vtk-m.git"
+    tags     = ['e4s']
 
     version('master', branch='master')
     version('release', branch='release')
diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py
index 180c89bd6d..0e75b40021 100644
--- a/var/spack/repos/builtin/packages/warpx/package.py
+++ b/var/spack/repos/builtin/packages/warpx/package.py
@@ -21,6 +21,7 @@ class Warpx(CMakePackage):
     git      = "https://github.com/ECP-WarpX/WarpX.git"
 
     maintainers = ['ax3l', 'dpgrote', 'MaxThevenet', 'RemiLehe']
+    tags = ['e4s']
 
     # NOTE: if you update the versions here, also see py-warpx
     version('develop', branch='development')
diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py
index b2080f6f58..135eed8b95 100644
--- a/var/spack/repos/builtin/packages/zfp/package.py
+++ b/var/spack/repos/builtin/packages/zfp/package.py
@@ -21,7 +21,7 @@ class Zfp(CMakePackage, CudaPackage):
     url         = 'https://github.com/LLNL/zfp/releases/download/0.5.5/zfp-0.5.5.tar.gz'
     git         = 'https://github.com/LLNL/zfp.git'
     maintainers = ['lindstro', 'GarrettDMorrison']
-    tags        = ['radiuss']
+    tags        = ['radiuss', 'e4s']
 
     # Versions
     version('develop', branch='develop')
-- 
cgit v1.2.3-60-g2f50