diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/adios2.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/adios2.yml
index 64ced82f..0b2e5fbe 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/adios2.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/adios2.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite adios2 test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/butterflypack.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/butterflypack.yml
index d30c9a58..e3c5d4e6 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/butterflypack.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/butterflypack.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite butterflypack test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/dyninst.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/dyninst.yml
index aa65d5f5..ca5269cf 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/dyninst.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/dyninst.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite dyninst test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/gasnet.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/gasnet.yml
index 152bc9a1..9eb26d7b 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/gasnet.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/gasnet.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite gasnet test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/hpctoolkit.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/hpctoolkit.yml
index d9375158..a082025f 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/hpctoolkit.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/hpctoolkit.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite hpctoolkit test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/kokkos.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/kokkos.yml
index 8bdd8d1d..5a796f55 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/kokkos.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/kokkos.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite kokkos test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/qthreads.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/qthreads.yml
index 5241f3dc..2376c79b 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/qthreads.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/qthreads.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite qthreads test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/strumpack.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/strumpack.yml
index 39adaa92..8b179c13 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/strumpack.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/strumpack.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite strumpack test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu-dist.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu-dist.yml
index 3e012325..4f61bcdd 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu-dist.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu-dist.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite superlu-dist test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu.yml
index 11568697..f2b28e2a 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/superlu.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite superlu test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/tau.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/tau.yml
index 008b0e51..332c787f 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/tau.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/tau.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite tau test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/trilinos.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/trilinos.yml
index 5e389fc7..6fca94e7 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/trilinos.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/trilinos.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite trilinos test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/vtk-m.yml b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/vtk-m.yml
index d1e1eb97..cb1b5003 100644
--- a/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/vtk-m.yml
+++ b/buildspecs/e4s/E4S-Testsuite/perlmutter/22.11/vtk-m.yml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite vtk-m test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu
diff --git a/buildspecs/e4s/testgen/e4s-22.11-template.yaml b/buildspecs/e4s/testgen/e4s-22.11-template.yaml
index 4ec6b5f0..650f62f1 100644
--- a/buildspecs/e4s/testgen/e4s-22.11-template.yaml
+++ b/buildspecs/e4s/testgen/e4s-22.11-template.yaml
@@ -4,8 +4,8 @@ buildspecs:
     type: script
     executor: perlmutter.slurm.regular
     description: Run E4S Testsuite {package} test for e4s/22.11 stack
-    tags: [e4s]
-    sbatch: ["-t 30", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
+    tags: [e4s-22.11]
+    sbatch: ["-t 120", "-N 1", "-G 1", "-A m3503_g", "-C gpu"]
     run: |
       module load e4s/22.11
       module load cpu