diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index d1cda3837..1a0e7feec 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -14,6 +14,9 @@ parameters:
   - name: CtestRegex
     type: string
     default: .*
+  - name: CtestExcludeRegex
+    type: string
+    default: ''
   - name: BuildReleaseArtifacts
     type: boolean
     default: true
@@ -41,6 +44,7 @@ jobs:
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
         TestPipeline: ${{ parameters.TestPipeline }}
         CtestRegex: ${{ parameters.CtestRegex }}
+        CtestExcludeRegex: ${{ parameters.CtestExcludeRegex }}
         CoverageReportPath: ${{ parameters.CoverageReportPath }}
         CoverageEnabled: ${{ parameters.CoverageEnabled }}
         LineCoverageTarget: ${{ parameters.LineCoverageTarget }}
diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index ed9315411..974988f68 100644
--- a/eng/pipelines/templates/jobs/ci.tests.yml
+++ b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -11,6 +11,9 @@ parameters:
   - name: CtestRegex
     type: string
     default: .*
+  - name: CtestExcludeRegex
+    type: string
+    default: ''
   - name: CoverageReportPath
     type: string
     default: 'sdk/*/*/*cov_xml.xml'
@@ -125,8 +128,16 @@ jobs:
           BuildArgs: "$(BuildArgs)"
           Env: "$(CmakeEnvArg)"
 
-      - script: ctest -C Debug -V --tests-regex ${{ parameters.CtestRegex }} --no-compress-output -T Test
+      - pwsh: |
+          ctest `
+            -C Debug `
+            -V `
+            --tests-regex '${{ parameters.CtestRegex }}' `
+            --exclude-regex '${{ parameters.CtestExcludeRegex }}' `
+            --no-compress-output `
+            -T Test
         workingDirectory: build
+        displayName: Test
 
       - task: PublishTestResults@2
         inputs:
diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml
index 9120807ae..710532bad 100644
--- a/eng/pipelines/templates/stages/archetype-cpp-release.yml
+++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml
@@ -153,7 +153,7 @@ stages:
                         parameters:
                           WorkingDirectory: $(Pipeline.Workspace)/vcpkg
 
-                      # SkipCheckingForChanges is true to skip the commit step 
+                      # SkipCheckingForChanges is true to skip the commit step
                       # (which is already done by Update-VcpkgPort.ps1)
                       - template: /eng/common/pipelines/templates/steps/create-pull-request.yml
                         parameters:
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index 6e54c9e06..f37870308 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -5,6 +5,9 @@ parameters:
 - name: CtestRegex
   type: string
   default: .*
+- name: CtestExcludeRegex
+  type: string
+  default: ''
 - name: CoverageEnabled
   type: boolean
   default: true
@@ -41,6 +44,7 @@ stages:
           ServiceDirectory: ${{ parameters.ServiceDirectory }}
           Artifacts: ${{ parameters.Artifacts }}
           CtestRegex: ${{ parameters.CtestRegex }}
+          CtestExcludeRegex: ${{ parameters.CtestExcludeRegex }}
           CoverageEnabled: ${{ parameters.CoverageEnabled }}
           CoverageReportPath: ${{ parameters.CoverageReportPath }}
           LineCoverageTarget: ${{ parameters.LineCoverageTarget }}
diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml
index 9bf3eda27..bb5962e39 100644
--- a/sdk/core/ci.yml
+++ b/sdk/core/ci.yml
@@ -1,5 +1,6 @@
 # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
 trigger:
+  batch: true
   branches:
     include:
       - master
@@ -34,7 +35,11 @@ stages:
     parameters:
       ServiceDirectory: core
       # CI has static code analysis disabled, while LiveTest will have it enabled
-      CtestRegex: azure-core.
+      # In the case of changes to core we want to re-run all CI tests for all
+      # libraries to check for potential regressions everywhere.
+      CtestRegex: .*
+      # Storage tests are live-only tests and must be excluded from CI runs
+      CtestExcludeRegex: livetest|azure-storage
       LiveTestCtestRegex: '"azure-core.|json-test"'
       LiveTestTimeoutInMinutes: 90 # default is 60 min. We need a little longer on worst case for Win+jsonTests
       LineCoverageTarget: 77
diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml
index 93d21ac14..cf14292ca 100644
--- a/sdk/identity/ci.yml
+++ b/sdk/identity/ci.yml
@@ -1,5 +1,6 @@
 # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
 trigger:
+  batch: true
   branches:
     include:
       - main
@@ -8,9 +9,6 @@ trigger:
       - hotfix/*
   paths:
     include:
-      - eng/
-      - CMakeLists.txt
-      - sdk/core
       - sdk/identity
 
 pr:
@@ -22,9 +20,6 @@ pr:
       - hotfix/*
   paths:
     include:
-      - eng/
-      - CMakeLists.txt
-      - sdk/core
       - sdk/identity
 
 stages:
diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
index 2729f1cdb..f1c8be337 100644
--- a/sdk/keyvault/ci.yml
+++ b/sdk/keyvault/ci.yml
@@ -1,5 +1,6 @@
 # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
 trigger:
+  batch: true
   branches:
     include:
       - main
@@ -8,10 +9,6 @@ trigger:
       - hotfix/*
   paths:
     include:
-      - cmake-modules/
-      - eng/
-      - CMakeLists.txt
-      - sdk/core
       - sdk/keyvault
 
 pr:
@@ -23,10 +20,6 @@ pr:
       - hotfix/*
   paths:
     include:
-      - cmake-modules/
-      - eng/
-      - CMakeLists.txt
-      - sdk/core/
       - sdk/keyvault
 
 stages:
diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index 5835f5873..5426d5c6b 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -8,11 +8,6 @@ trigger:
       - hotfix/*
   paths:
     include:
-      - cmake-modules/
-      - eng/
-      - CMakeLists.txt
-      - sdk/core
-      - sdk/identity
       - sdk/storage
 
 pr:
@@ -24,11 +19,6 @@ pr:
       - hotfix/*
   paths:
     include:
-      - cmake-modules/
-      - eng/
-      - CMakeLists.txt
-      - sdk/core/
-      - sdk/identity/
       - sdk/storage
 
 stages:
diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml
index 3618684a7..8f81c49af 100644
--- a/sdk/template/ci.yml
+++ b/sdk/template/ci.yml
@@ -1,5 +1,6 @@
 # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
 trigger:
+  batch: true
   branches:
     include:
       - main
@@ -8,10 +9,6 @@ trigger:
       - hotfix/*
   paths:
     include:
-      - cmake-modules/
-      - eng/
-      - CMakeLists.txt
-      - sdk/core
       - sdk/template
 
 pr:
@@ -23,10 +20,6 @@ pr:
       - hotfix/*
   paths:
     include:
-      - cmake-modules/
-      - eng/
-      - CMakeLists.txt
-      - sdk/core/
       - sdk/template
 
 stages: