diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index a48e3681e94e..7e587a2e8762 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -254,6 +254,7 @@ jobs:
           - "**/version.py"
           - "**/README.md"
           - "**/CHANGELOG.md"
+          - "**/*matrix*.json"
         EnablePRGeneration: true
         PRMatrixSetting: "TargetingString"
         PreGenerationSteps:
diff --git a/sdk/attestation/ci.yml b/sdk/attestation/ci.yml
index 9eb456cc2268..118897a02e1e 100644
--- a/sdk/attestation/ci.yml
+++ b/sdk/attestation/ci.yml
@@ -28,12 +28,6 @@ extends:
   parameters:
     ServiceDirectory: attestation
     TestProxy: true
-    # Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837
-    MatrixConfigs:
-      - Name: attestation_ci_matrix
-        Path: eng/pipelines/templates/stages/platform-matrix.json
-        Selection: sparse
-        GenerateVMJobs: true
     Artifacts:
     - name: azure-mgmt-attestation
       safeName: azuremgmtattestation
diff --git a/sdk/evaluation/ci.yml b/sdk/evaluation/ci.yml
index cfd1a9f43ae7..628963561d6d 100644
--- a/sdk/evaluation/ci.yml
+++ b/sdk/evaluation/ci.yml
@@ -30,11 +30,8 @@ extends:
     TestProxy: true
     # This custom matrix config should be dropped once:
     #  * Once azure-ai-ml supports 3.13 (currently crashes due to type annotation)
-    MatrixConfigs:
-      - Name: evaluation_ci_matrix
-        Path: eng/pipelines/templates/stages/platform-matrix-no-313.json
-        Selection: sparse
-        GenerateVMJobs: true
+    MatrixFilters:
+      - PythonVersion=^(?!3\.13)
     Artifacts:
     - name: azure-ai-evaluation
       safeName: azureaievaluation
diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
index 7417cb7337ee..c69612d67ec7 100644
--- a/sdk/keyvault/ci.yml
+++ b/sdk/keyvault/ci.yml
@@ -31,12 +31,6 @@ extends:
   parameters:
     ServiceDirectory: keyvault
     TestProxy: true
-    # Override the base matrix due to https://github.com/Azure/azure-sdk-for-python/issues/17837
-    MatrixConfigs:
-      - Name: keyvault_ci_matrix
-        Path: eng/pipelines/templates/stages/platform-matrix.json
-        Selection: sparse
-        GenerateVMJobs: true
     Artifacts:
     - name: azure-keyvault-administration
       safename: azurekeyvaultadministration