diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 2f4b00d7f..9b4bbb2ec 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -29,11 +29,29 @@ post:
   - func: "stop mongo-orchestration"
   - func: "cleanup"
 
-# Define aliases for patch builds and PR builds. These only apply if no aliases are defined in project settings
-github_pr_aliases:
-  # Run tests on debian, only testing local replicasets
-  - variant: "test-.*"
-    task: "test-mongodb-.*-replicaset"
+# These aliases define the default variant/tasks to test for pull requests and merge queue
+github_pr_aliases: &github_pr_aliases
+  # Always test all builds for consistency
+  - variant_tags: ["pr build"]
+    task_tags: ["pr"]
+  # Run all tasks in PR variants for PHP 8.3 (excluding MongoDB latest)
+  - variant_tags: ["pr php8.3"]
+    task_tags: ["!latest"]
+  # Run PR tasks for all PR variants (only MongoDB 7.0)
+  - variant_tags: ["pr"]
+    task_tags: ["pr 7.0"]
+
+commit_queue_aliases: *github_pr_aliases
+
+git_tag_aliases:
+  - git_tag: "^[0-9]+.[0-9]+.[0-9]+"
+    remote_path: ""
+    variant_tags: ["tag"]
+    task_tags: ["tag !latest"]
+
+github_checks_aliases:
+  - variant: ".*"
+    task: ".*"
 
 # Include files that contain various tasks, task groups, and build variant definitions
 include:
diff --git a/.evergreen/config/generated/build/build-php-7.4.yml b/.evergreen/config/generated/build/build-php-7.4.yml
index c4fe5b629..bde1fcd42 100644
--- a/.evergreen/config/generated/build/build-php-7.4.yml
+++ b/.evergreen/config/generated/build/build-php-7.4.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/build/build-extension.yml" template file instead.
 tasks:
   - name: "build-php-7.4"
-    tags: ["build", "php7.4", "stable"]
+    tags: ["build", "php7.4", "stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -9,7 +9,7 @@ tasks:
       - func: "compile extension"
       - func: "upload extension"
   - name: "build-php-7.4-lowest"
-    tags: ["build", "php7.4", "lowest"]
+    tags: ["build", "php7.4", "lowest", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -19,7 +19,7 @@ tasks:
           EXTENSION_VERSION: "1.18.0"
       - func: "upload extension"
   - name: "build-php-7.4-next-stable"
-    tags: ["build", "php7.4", "next-stable"]
+    tags: ["build", "php7.4", "next-stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/generated/build/build-php-8.0.yml b/.evergreen/config/generated/build/build-php-8.0.yml
index 87bcccf7a..ceaee2932 100644
--- a/.evergreen/config/generated/build/build-php-8.0.yml
+++ b/.evergreen/config/generated/build/build-php-8.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/build/build-extension.yml" template file instead.
 tasks:
   - name: "build-php-8.0"
-    tags: ["build", "php8.0", "stable"]
+    tags: ["build", "php8.0", "stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -9,7 +9,7 @@ tasks:
       - func: "compile extension"
       - func: "upload extension"
   - name: "build-php-8.0-lowest"
-    tags: ["build", "php8.0", "lowest"]
+    tags: ["build", "php8.0", "lowest", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -19,7 +19,7 @@ tasks:
           EXTENSION_VERSION: "1.18.0"
       - func: "upload extension"
   - name: "build-php-8.0-next-stable"
-    tags: ["build", "php8.0", "next-stable"]
+    tags: ["build", "php8.0", "next-stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/generated/build/build-php-8.1.yml b/.evergreen/config/generated/build/build-php-8.1.yml
index 466585557..ce4725b6f 100644
--- a/.evergreen/config/generated/build/build-php-8.1.yml
+++ b/.evergreen/config/generated/build/build-php-8.1.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/build/build-extension.yml" template file instead.
 tasks:
   - name: "build-php-8.1"
-    tags: ["build", "php8.1", "stable"]
+    tags: ["build", "php8.1", "stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -9,7 +9,7 @@ tasks:
       - func: "compile extension"
       - func: "upload extension"
   - name: "build-php-8.1-lowest"
-    tags: ["build", "php8.1", "lowest"]
+    tags: ["build", "php8.1", "lowest", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -19,7 +19,7 @@ tasks:
           EXTENSION_VERSION: "1.18.0"
       - func: "upload extension"
   - name: "build-php-8.1-next-stable"
-    tags: ["build", "php8.1", "next-stable"]
+    tags: ["build", "php8.1", "next-stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/generated/build/build-php-8.2.yml b/.evergreen/config/generated/build/build-php-8.2.yml
index f18297acf..af5cdfaf8 100644
--- a/.evergreen/config/generated/build/build-php-8.2.yml
+++ b/.evergreen/config/generated/build/build-php-8.2.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/build/build-extension.yml" template file instead.
 tasks:
   - name: "build-php-8.2"
-    tags: ["build", "php8.2", "stable"]
+    tags: ["build", "php8.2", "stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -9,7 +9,7 @@ tasks:
       - func: "compile extension"
       - func: "upload extension"
   - name: "build-php-8.2-lowest"
-    tags: ["build", "php8.2", "lowest"]
+    tags: ["build", "php8.2", "lowest", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -19,7 +19,7 @@ tasks:
           EXTENSION_VERSION: "1.18.0"
       - func: "upload extension"
   - name: "build-php-8.2-next-stable"
-    tags: ["build", "php8.2", "next-stable"]
+    tags: ["build", "php8.2", "next-stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/generated/build/build-php-8.3.yml b/.evergreen/config/generated/build/build-php-8.3.yml
index a788199a6..8d77a44d2 100644
--- a/.evergreen/config/generated/build/build-php-8.3.yml
+++ b/.evergreen/config/generated/build/build-php-8.3.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/build/build-extension.yml" template file instead.
 tasks:
   - name: "build-php-8.3"
-    tags: ["build", "php8.3", "stable"]
+    tags: ["build", "php8.3", "stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -9,7 +9,7 @@ tasks:
       - func: "compile extension"
       - func: "upload extension"
   - name: "build-php-8.3-lowest"
-    tags: ["build", "php8.3", "lowest"]
+    tags: ["build", "php8.3", "lowest", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -19,7 +19,7 @@ tasks:
           EXTENSION_VERSION: "1.18.0"
       - func: "upload extension"
   - name: "build-php-8.3-next-stable"
-    tags: ["build", "php8.3", "next-stable"]
+    tags: ["build", "php8.3", "next-stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/generated/test-variant/latest-php-8.3.yml b/.evergreen/config/generated/test-variant/latest-php-8.3.yml
index b10b7381b..bfd7f0a05 100644
--- a/.evergreen/config/generated/test-variant/latest-php-8.3.yml
+++ b/.evergreen/config/generated/test-variant/latest-php-8.3.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test-variant/latest.yml" template file instead.
 buildvariants:
   - name: test-debian11-php-8.3-local
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php8.3", "pr", "tag"]
     display_name: "Test: Debian 11, PHP 8.3"
     run_on: debian11-small
     expansions:
@@ -22,7 +22,7 @@ buildvariants:
       - "test-atlas-data-lake"
 
   - name: test-debian92-php-8.3-local
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php8.3", "pr", "tag"]
     display_name: "Test: Debian 9.2, PHP 8.3"
     run_on: debian92-small
     expansions:
@@ -41,7 +41,7 @@ buildvariants:
 
   # Test with upcoming PHPC versions
   - name: test-debian11-php-8.3-phpc-next-stable
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php8.3", "pr", "tag"]
     display_name: "Test: Debian 11, PHP 8.3, PHPC next-stable"
     run_on: debian11-small
     expansions:
@@ -55,7 +55,7 @@ buildvariants:
       - ".replicaset .local .7.0 !.csfle"
 
   - name: test-debian11-php-8.3-phpc-next-minor
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php8.3"]
     display_name: "Test: Debian 11, PHP 8.3, PHPC next-minor"
     run_on: debian11-small
     expansions:
@@ -70,7 +70,7 @@ buildvariants:
 
   # Test Atlas and CSFLE on RHEL 8
   - name: test-rhel80-php-8.3-atlas
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php8.3", "pr", "tag"]
     display_name: "Test: RHEL 8.0, PHP 8.3"
     run_on: rhel80-small
     expansions:
diff --git a/.evergreen/config/generated/test-variant/lowest-php-7.4.yml b/.evergreen/config/generated/test-variant/lowest-php-7.4.yml
index c1f2bdacb..3d8f767b3 100644
--- a/.evergreen/config/generated/test-variant/lowest-php-7.4.yml
+++ b/.evergreen/config/generated/test-variant/lowest-php-7.4.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test-variant/lowest.yml" template file instead.
 buildvariants:
   - name: test-debian92-php-7.4-local-lowest
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php7.4", "pr", "tag"]
     display_name: "Test: Debian 9.2, PHP 7.4, Lowest Dependencies"
     run_on: debian92-small
     expansions:
diff --git a/.evergreen/config/generated/test-variant/replicaset-php-7.4.yml b/.evergreen/config/generated/test-variant/replicaset-php-7.4.yml
index f8c50d1e3..3524b5151 100644
--- a/.evergreen/config/generated/test-variant/replicaset-php-7.4.yml
+++ b/.evergreen/config/generated/test-variant/replicaset-php-7.4.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test-variant/replicaset-only.yml" template file instead.
 buildvariants:
   - name: test-debian11-php-7.4-local
-    tags: [ "test", "debian", "x64" ]
+    tags: [ "test", "debian", "x64", "php7.4", "pr", "tag" ]
     display_name: "Test: Debian 11, PHP 7.4"
     run_on: debian11-small
     expansions:
diff --git a/.evergreen/config/generated/test-variant/replicaset-php-8.0.yml b/.evergreen/config/generated/test-variant/replicaset-php-8.0.yml
index c4c4f6d2a..9ca4995f5 100644
--- a/.evergreen/config/generated/test-variant/replicaset-php-8.0.yml
+++ b/.evergreen/config/generated/test-variant/replicaset-php-8.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test-variant/replicaset-only.yml" template file instead.
 buildvariants:
   - name: test-debian11-php-8.0-local
-    tags: [ "test", "debian", "x64" ]
+    tags: [ "test", "debian", "x64", "php8.0", "pr", "tag" ]
     display_name: "Test: Debian 11, PHP 8.0"
     run_on: debian11-small
     expansions:
diff --git a/.evergreen/config/generated/test-variant/replicaset-php-8.1.yml b/.evergreen/config/generated/test-variant/replicaset-php-8.1.yml
index 11efa72b0..b19d6a3bf 100644
--- a/.evergreen/config/generated/test-variant/replicaset-php-8.1.yml
+++ b/.evergreen/config/generated/test-variant/replicaset-php-8.1.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test-variant/replicaset-only.yml" template file instead.
 buildvariants:
   - name: test-debian11-php-8.1-local
-    tags: [ "test", "debian", "x64" ]
+    tags: [ "test", "debian", "x64", "php8.1", "pr", "tag" ]
     display_name: "Test: Debian 11, PHP 8.1"
     run_on: debian11-small
     expansions:
diff --git a/.evergreen/config/generated/test-variant/replicaset-php-8.2.yml b/.evergreen/config/generated/test-variant/replicaset-php-8.2.yml
index e8e76d53d..0fb623340 100644
--- a/.evergreen/config/generated/test-variant/replicaset-php-8.2.yml
+++ b/.evergreen/config/generated/test-variant/replicaset-php-8.2.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test-variant/replicaset-only.yml" template file instead.
 buildvariants:
   - name: test-debian11-php-8.2-local
-    tags: [ "test", "debian", "x64" ]
+    tags: [ "test", "debian", "x64", "php8.2", "pr", "tag" ]
     display_name: "Test: Debian 11, PHP 8.2"
     run_on: debian11-small
     expansions:
diff --git a/.evergreen/config/generated/test/csfle-4.2.yml b/.evergreen/config/generated/test/csfle-4.2.yml
index dda70b6c1..3f09fde3e 100644
--- a/.evergreen/config/generated/test/csfle-4.2.yml
+++ b/.evergreen/config/generated/test/csfle-4.2.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/csfle.yml" template file instead.
 tasks:
   - name: "test-mongodb-4.2-crypt-shared"
-    tags: ["replicaset", "local", "4.2", "csfle"]
+    tags: ["replicaset", "local", "4.2", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -14,7 +14,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-4.2-mongocryptd"
-    tags: ["replicaset", "local", "4.2", "csfle"]
+    tags: ["replicaset", "local", "4.2", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -28,7 +28,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-4.2-no-aws-creds"
-    tags: ["replicaset", "local", "4.2", "csfle"]
+    tags: ["replicaset", "local", "4.2", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/csfle-4.4.yml b/.evergreen/config/generated/test/csfle-4.4.yml
index ba58c8f0b..297321d0a 100644
--- a/.evergreen/config/generated/test/csfle-4.4.yml
+++ b/.evergreen/config/generated/test/csfle-4.4.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/csfle.yml" template file instead.
 tasks:
   - name: "test-mongodb-4.4-crypt-shared"
-    tags: ["replicaset", "local", "4.4", "csfle"]
+    tags: ["replicaset", "local", "4.4", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -14,7 +14,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-4.4-mongocryptd"
-    tags: ["replicaset", "local", "4.4", "csfle"]
+    tags: ["replicaset", "local", "4.4", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -28,7 +28,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-4.4-no-aws-creds"
-    tags: ["replicaset", "local", "4.4", "csfle"]
+    tags: ["replicaset", "local", "4.4", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/csfle-5.0.yml b/.evergreen/config/generated/test/csfle-5.0.yml
index 8088b15ef..b8bbe6cc7 100644
--- a/.evergreen/config/generated/test/csfle-5.0.yml
+++ b/.evergreen/config/generated/test/csfle-5.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/csfle.yml" template file instead.
 tasks:
   - name: "test-mongodb-5.0-crypt-shared"
-    tags: ["replicaset", "local", "5.0", "csfle"]
+    tags: ["replicaset", "local", "5.0", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -14,7 +14,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-5.0-mongocryptd"
-    tags: ["replicaset", "local", "5.0", "csfle"]
+    tags: ["replicaset", "local", "5.0", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -28,7 +28,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-5.0-no-aws-creds"
-    tags: ["replicaset", "local", "5.0", "csfle"]
+    tags: ["replicaset", "local", "5.0", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/csfle-6.0.yml b/.evergreen/config/generated/test/csfle-6.0.yml
index 799aa62aa..63a0f1318 100644
--- a/.evergreen/config/generated/test/csfle-6.0.yml
+++ b/.evergreen/config/generated/test/csfle-6.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/csfle.yml" template file instead.
 tasks:
   - name: "test-mongodb-6.0-crypt-shared"
-    tags: ["replicaset", "local", "6.0", "csfle"]
+    tags: ["replicaset", "local", "6.0", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -14,7 +14,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-6.0-mongocryptd"
-    tags: ["replicaset", "local", "6.0", "csfle"]
+    tags: ["replicaset", "local", "6.0", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -28,7 +28,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-6.0-no-aws-creds"
-    tags: ["replicaset", "local", "6.0", "csfle"]
+    tags: ["replicaset", "local", "6.0", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/csfle-7.0.yml b/.evergreen/config/generated/test/csfle-7.0.yml
index c34d0f7e2..3b0c763c3 100644
--- a/.evergreen/config/generated/test/csfle-7.0.yml
+++ b/.evergreen/config/generated/test/csfle-7.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/csfle.yml" template file instead.
 tasks:
   - name: "test-mongodb-7.0-crypt-shared"
-    tags: ["replicaset", "local", "7.0", "csfle"]
+    tags: ["replicaset", "local", "7.0", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -14,7 +14,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-7.0-mongocryptd"
-    tags: ["replicaset", "local", "7.0", "csfle"]
+    tags: ["replicaset", "local", "7.0", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -28,7 +28,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-7.0-no-aws-creds"
-    tags: ["replicaset", "local", "7.0", "csfle"]
+    tags: ["replicaset", "local", "7.0", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/csfle-latest.yml b/.evergreen/config/generated/test/csfle-latest.yml
index aaea2ff51..9e338c29f 100644
--- a/.evergreen/config/generated/test/csfle-latest.yml
+++ b/.evergreen/config/generated/test/csfle-latest.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/csfle.yml" template file instead.
 tasks:
   - name: "test-mongodb-latest-crypt-shared"
-    tags: ["replicaset", "local", "latest", "csfle"]
+    tags: ["replicaset", "local", "latest", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -14,7 +14,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-latest-mongocryptd"
-    tags: ["replicaset", "local", "latest", "csfle"]
+    tags: ["replicaset", "local", "latest", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -28,7 +28,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-latest-no-aws-creds"
-    tags: ["replicaset", "local", "latest", "csfle"]
+    tags: ["replicaset", "local", "latest", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/csfle-rapid.yml b/.evergreen/config/generated/test/csfle-rapid.yml
index 9be8bb7c4..781c29803 100644
--- a/.evergreen/config/generated/test/csfle-rapid.yml
+++ b/.evergreen/config/generated/test/csfle-rapid.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/csfle.yml" template file instead.
 tasks:
   - name: "test-mongodb-rapid-crypt-shared"
-    tags: ["replicaset", "local", "rapid", "csfle"]
+    tags: ["replicaset", "local", "rapid", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -14,7 +14,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-rapid-mongocryptd"
-    tags: ["replicaset", "local", "rapid", "csfle"]
+    tags: ["replicaset", "local", "rapid", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -28,7 +28,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-rapid-no-aws-creds"
-    tags: ["replicaset", "local", "rapid", "csfle"]
+    tags: ["replicaset", "local", "rapid", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/load-balanced-5.0.yml b/.evergreen/config/generated/test/load-balanced-5.0.yml
index 298fd1d9b..71d3518c6 100644
--- a/.evergreen/config/generated/test/load-balanced-5.0.yml
+++ b/.evergreen/config/generated/test/load-balanced-5.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-5.0-loadbalanced"
-    tags: ["loadbalanced", "local", "5.0"]
+    tags: ["loadbalanced", "local", "5.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/load-balanced-6.0.yml b/.evergreen/config/generated/test/load-balanced-6.0.yml
index 08dc85242..3f3bdbe93 100644
--- a/.evergreen/config/generated/test/load-balanced-6.0.yml
+++ b/.evergreen/config/generated/test/load-balanced-6.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-6.0-loadbalanced"
-    tags: ["loadbalanced", "local", "6.0"]
+    tags: ["loadbalanced", "local", "6.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/load-balanced-7.0.yml b/.evergreen/config/generated/test/load-balanced-7.0.yml
index cfe28ac40..9b194bb3f 100644
--- a/.evergreen/config/generated/test/load-balanced-7.0.yml
+++ b/.evergreen/config/generated/test/load-balanced-7.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-7.0-loadbalanced"
-    tags: ["loadbalanced", "local", "7.0"]
+    tags: ["loadbalanced", "local", "7.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/load-balanced-latest.yml b/.evergreen/config/generated/test/load-balanced-latest.yml
index 16b197357..5b46f73c8 100644
--- a/.evergreen/config/generated/test/load-balanced-latest.yml
+++ b/.evergreen/config/generated/test/load-balanced-latest.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-latest-loadbalanced"
-    tags: ["loadbalanced", "local", "latest"]
+    tags: ["loadbalanced", "local", "latest", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/load-balanced-rapid.yml b/.evergreen/config/generated/test/load-balanced-rapid.yml
index adc8dc096..6743f27cf 100644
--- a/.evergreen/config/generated/test/load-balanced-rapid.yml
+++ b/.evergreen/config/generated/test/load-balanced-rapid.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-rapid-loadbalanced"
-    tags: ["loadbalanced", "local", "rapid"]
+    tags: ["loadbalanced", "local", "rapid", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-3.6.yml b/.evergreen/config/generated/test/local-3.6.yml
index 377240fc8..45272379b 100644
--- a/.evergreen/config/generated/test/local-3.6.yml
+++ b/.evergreen/config/generated/test/local-3.6.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-3.6-standalone-noauth-nossl"
-    tags: ["standalone", "local", "3.6"]
+    tags: ["standalone", "local", "3.6", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-3.6-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "3.6"]
+    tags: ["replicaset", "local", "3.6", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-3.6-sharded-noauth-nossl"
-    tags: ["sharded", "local", "3.6"]
+    tags: ["sharded", "local", "3.6", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-4.0.yml b/.evergreen/config/generated/test/local-4.0.yml
index 6a12e4d68..c956555d5 100644
--- a/.evergreen/config/generated/test/local-4.0.yml
+++ b/.evergreen/config/generated/test/local-4.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-4.0-standalone-noauth-nossl"
-    tags: ["standalone", "local", "4.0"]
+    tags: ["standalone", "local", "4.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-4.0-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "4.0"]
+    tags: ["replicaset", "local", "4.0", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-4.0-sharded-noauth-nossl"
-    tags: ["sharded", "local", "4.0"]
+    tags: ["sharded", "local", "4.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-4.2.yml b/.evergreen/config/generated/test/local-4.2.yml
index 56e6fd013..523514069 100644
--- a/.evergreen/config/generated/test/local-4.2.yml
+++ b/.evergreen/config/generated/test/local-4.2.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-4.2-standalone-noauth-nossl"
-    tags: ["standalone", "local", "4.2"]
+    tags: ["standalone", "local", "4.2", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-4.2-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "4.2"]
+    tags: ["replicaset", "local", "4.2", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-4.2-sharded-noauth-nossl"
-    tags: ["sharded", "local", "4.2"]
+    tags: ["sharded", "local", "4.2", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-4.4.yml b/.evergreen/config/generated/test/local-4.4.yml
index 5b5c31bdc..efc614eb3 100644
--- a/.evergreen/config/generated/test/local-4.4.yml
+++ b/.evergreen/config/generated/test/local-4.4.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-4.4-standalone-noauth-nossl"
-    tags: ["standalone", "local", "4.4"]
+    tags: ["standalone", "local", "4.4", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-4.4-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "4.4"]
+    tags: ["replicaset", "local", "4.4", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-4.4-sharded-noauth-nossl"
-    tags: ["sharded", "local", "4.4"]
+    tags: ["sharded", "local", "4.4", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-5.0.yml b/.evergreen/config/generated/test/local-5.0.yml
index 4dfbe6ae2..0460defdf 100644
--- a/.evergreen/config/generated/test/local-5.0.yml
+++ b/.evergreen/config/generated/test/local-5.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-5.0-standalone-noauth-nossl"
-    tags: ["standalone", "local", "5.0"]
+    tags: ["standalone", "local", "5.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-5.0-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "5.0"]
+    tags: ["replicaset", "local", "5.0", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-5.0-sharded-noauth-nossl"
-    tags: ["sharded", "local", "5.0"]
+    tags: ["sharded", "local", "5.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-6.0.yml b/.evergreen/config/generated/test/local-6.0.yml
index f9ce1e68c..28a3dc52d 100644
--- a/.evergreen/config/generated/test/local-6.0.yml
+++ b/.evergreen/config/generated/test/local-6.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-6.0-standalone-noauth-nossl"
-    tags: ["standalone", "local", "6.0"]
+    tags: ["standalone", "local", "6.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-6.0-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "6.0"]
+    tags: ["replicaset", "local", "6.0", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-6.0-sharded-noauth-nossl"
-    tags: ["sharded", "local", "6.0"]
+    tags: ["sharded", "local", "6.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-7.0.yml b/.evergreen/config/generated/test/local-7.0.yml
index 77a5c9696..b542eefe7 100644
--- a/.evergreen/config/generated/test/local-7.0.yml
+++ b/.evergreen/config/generated/test/local-7.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-7.0-standalone-noauth-nossl"
-    tags: ["standalone", "local", "7.0"]
+    tags: ["standalone", "local", "7.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-7.0-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "7.0"]
+    tags: ["replicaset", "local", "7.0", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-7.0-sharded-noauth-nossl"
-    tags: ["sharded", "local", "7.0"]
+    tags: ["sharded", "local", "7.0", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-latest.yml b/.evergreen/config/generated/test/local-latest.yml
index be2b0611e..31a178297 100644
--- a/.evergreen/config/generated/test/local-latest.yml
+++ b/.evergreen/config/generated/test/local-latest.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-latest-standalone-noauth-nossl"
-    tags: ["standalone", "local", "latest"]
+    tags: ["standalone", "local", "latest", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-latest-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "latest"]
+    tags: ["replicaset", "local", "latest", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-latest-sharded-noauth-nossl"
-    tags: ["sharded", "local", "latest"]
+    tags: ["sharded", "local", "latest", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/local-rapid.yml b/.evergreen/config/generated/test/local-rapid.yml
index 339e1ff3a..b68e5c067 100644
--- a/.evergreen/config/generated/test/local-rapid.yml
+++ b/.evergreen/config/generated/test/local-rapid.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/local.yml" template file instead.
 tasks:
   - name: "test-mongodb-rapid-standalone-noauth-nossl"
-    tags: ["standalone", "local", "rapid"]
+    tags: ["standalone", "local", "rapid", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -12,7 +12,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-rapid-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "rapid"]
+    tags: ["replicaset", "local", "rapid", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -23,7 +23,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-rapid-sharded-noauth-nossl"
-    tags: ["sharded", "local", "rapid"]
+    tags: ["sharded", "local", "rapid", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/require-api-version-5.0.yml b/.evergreen/config/generated/test/require-api-version-5.0.yml
index fc43a4bd7..0dcf66c20 100644
--- a/.evergreen/config/generated/test/require-api-version-5.0.yml
+++ b/.evergreen/config/generated/test/require-api-version-5.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-mongodb-5.0-requireApiVersion"
-    tags: ["standalone", "local", "5.0", "versioned_api"]
+    tags: ["standalone", "local", "5.0", "versioned_api", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/require-api-version-6.0.yml b/.evergreen/config/generated/test/require-api-version-6.0.yml
index a67154074..2bf25a7f4 100644
--- a/.evergreen/config/generated/test/require-api-version-6.0.yml
+++ b/.evergreen/config/generated/test/require-api-version-6.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-mongodb-6.0-requireApiVersion"
-    tags: ["standalone", "local", "6.0", "versioned_api"]
+    tags: ["standalone", "local", "6.0", "versioned_api", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/require-api-version-7.0.yml b/.evergreen/config/generated/test/require-api-version-7.0.yml
index 1e0885084..21c38a3e7 100644
--- a/.evergreen/config/generated/test/require-api-version-7.0.yml
+++ b/.evergreen/config/generated/test/require-api-version-7.0.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-mongodb-7.0-requireApiVersion"
-    tags: ["standalone", "local", "7.0", "versioned_api"]
+    tags: ["standalone", "local", "7.0", "versioned_api", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/require-api-version-latest.yml b/.evergreen/config/generated/test/require-api-version-latest.yml
index 6b7647458..af4cfbe5e 100644
--- a/.evergreen/config/generated/test/require-api-version-latest.yml
+++ b/.evergreen/config/generated/test/require-api-version-latest.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-mongodb-latest-requireApiVersion"
-    tags: ["standalone", "local", "latest", "versioned_api"]
+    tags: ["standalone", "local", "latest", "versioned_api", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/generated/test/require-api-version-rapid.yml b/.evergreen/config/generated/test/require-api-version-rapid.yml
index 423d2bf58..0c4234bea 100644
--- a/.evergreen/config/generated/test/require-api-version-rapid.yml
+++ b/.evergreen/config/generated/test/require-api-version-rapid.yml
@@ -1,7 +1,7 @@
 # This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-mongodb-rapid-requireApiVersion"
-    tags: ["standalone", "local", "rapid", "versioned_api"]
+    tags: ["standalone", "local", "rapid", "versioned_api", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/templates/build/build-extension.yml b/.evergreen/config/templates/build/build-extension.yml
index d63c37b81..5484697d1 100644
--- a/.evergreen/config/templates/build/build-extension.yml
+++ b/.evergreen/config/templates/build/build-extension.yml
@@ -1,6 +1,6 @@
 tasks:
   - name: "build-php-%phpVersion%"
-    tags: ["build", "php%phpVersion%", "stable"]
+    tags: ["build", "php%phpVersion%", "stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -8,7 +8,7 @@ tasks:
       - func: "compile extension"
       - func: "upload extension"
   - name: "build-php-%phpVersion%-lowest"
-    tags: ["build", "php%phpVersion%", "lowest"]
+    tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
@@ -18,7 +18,7 @@ tasks:
           EXTENSION_VERSION: "1.18.0"
       - func: "upload extension"
   - name: "build-php-%phpVersion%-next-stable"
-    tags: ["build", "php%phpVersion%", "next-stable"]
+    tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/templates/test-variant/latest.yml b/.evergreen/config/templates/test-variant/latest.yml
index 202616a56..4973697ed 100644
--- a/.evergreen/config/templates/test-variant/latest.yml
+++ b/.evergreen/config/templates/test-variant/latest.yml
@@ -1,6 +1,6 @@
 buildvariants:
   - name: test-debian11-php-%phpVersion%-local
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"]
     display_name: "Test: Debian 11, PHP %phpVersion%"
     run_on: debian11-small
     expansions:
@@ -21,7 +21,7 @@ buildvariants:
       - "test-atlas-data-lake"
 
   - name: test-debian92-php-%phpVersion%-local
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"]
     display_name: "Test: Debian 9.2, PHP %phpVersion%"
     run_on: debian92-small
     expansions:
@@ -40,7 +40,7 @@ buildvariants:
 
   # Test with upcoming PHPC versions
   - name: test-debian11-php-%phpVersion%-phpc-next-stable
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"]
     display_name: "Test: Debian 11, PHP %phpVersion%, PHPC next-stable"
     run_on: debian11-small
     expansions:
@@ -54,7 +54,7 @@ buildvariants:
       - ".replicaset .local .7.0 !.csfle"
 
   - name: test-debian11-php-%phpVersion%-phpc-next-minor
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php%phpVersion%"]
     display_name: "Test: Debian 11, PHP %phpVersion%, PHPC next-minor"
     run_on: debian11-small
     expansions:
@@ -69,7 +69,7 @@ buildvariants:
 
   # Test Atlas and CSFLE on RHEL 8
   - name: test-rhel80-php-%phpVersion%-atlas
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"]
     display_name: "Test: RHEL 8.0, PHP %phpVersion%"
     run_on: rhel80-small
     expansions:
diff --git a/.evergreen/config/templates/test-variant/lowest.yml b/.evergreen/config/templates/test-variant/lowest.yml
index 2ab3bcf68..9db3d3fb9 100644
--- a/.evergreen/config/templates/test-variant/lowest.yml
+++ b/.evergreen/config/templates/test-variant/lowest.yml
@@ -1,6 +1,6 @@
 buildvariants:
   - name: test-debian92-php-%phpVersion%-local-lowest
-    tags: ["test", "debian", "x64"]
+    tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"]
     display_name: "Test: Debian 9.2, PHP %phpVersion%, Lowest Dependencies"
     run_on: debian92-small
     expansions:
diff --git a/.evergreen/config/templates/test-variant/replicaset-only.yml b/.evergreen/config/templates/test-variant/replicaset-only.yml
index 629fc3664..17f22f9f0 100644
--- a/.evergreen/config/templates/test-variant/replicaset-only.yml
+++ b/.evergreen/config/templates/test-variant/replicaset-only.yml
@@ -1,6 +1,6 @@
 buildvariants:
   - name: test-debian11-php-%phpVersion%-local
-    tags: [ "test", "debian", "x64" ]
+    tags: [ "test", "debian", "x64", "php%phpVersion%", "pr", "tag" ]
     display_name: "Test: Debian 11, PHP %phpVersion%"
     run_on: debian11-small
     expansions:
diff --git a/.evergreen/config/templates/test/csfle.yml b/.evergreen/config/templates/test/csfle.yml
index b256c4d24..3713061e4 100644
--- a/.evergreen/config/templates/test/csfle.yml
+++ b/.evergreen/config/templates/test/csfle.yml
@@ -1,6 +1,6 @@
 tasks:
   - name: "test-mongodb-%mongodbVersion%-crypt-shared"
-    tags: ["replicaset", "local", "%mongodbVersion%", "csfle"]
+    tags: ["replicaset", "local", "%mongodbVersion%", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -13,7 +13,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-%mongodbVersion%-mongocryptd"
-    tags: ["replicaset", "local", "%mongodbVersion%", "csfle"]
+    tags: ["replicaset", "local", "%mongodbVersion%", "csfle", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -27,7 +27,7 @@ tasks:
           TESTS: "csfle"
 
   - name: "test-mongodb-%mongodbVersion%-no-aws-creds"
-    tags: ["replicaset", "local", "%mongodbVersion%", "csfle"]
+    tags: ["replicaset", "local", "%mongodbVersion%", "csfle", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/templates/test/load-balanced.yml b/.evergreen/config/templates/test/load-balanced.yml
index ca36912ad..f9933a508 100644
--- a/.evergreen/config/templates/test/load-balanced.yml
+++ b/.evergreen/config/templates/test/load-balanced.yml
@@ -1,6 +1,6 @@
 tasks:
   - name: "test-mongodb-%mongodbVersion%-loadbalanced"
-    tags: ["loadbalanced", "local", "%mongodbVersion%"]
+    tags: ["loadbalanced", "local", "%mongodbVersion%", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/templates/test/local.yml b/.evergreen/config/templates/test/local.yml
index 462c7d4f6..29cef4c52 100644
--- a/.evergreen/config/templates/test/local.yml
+++ b/.evergreen/config/templates/test/local.yml
@@ -1,6 +1,6 @@
 tasks:
   - name: "test-mongodb-%mongodbVersion%-standalone-noauth-nossl"
-    tags: ["standalone", "local", "%mongodbVersion%"]
+    tags: ["standalone", "local", "%mongodbVersion%", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -11,7 +11,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-%mongodbVersion%-replicaset-noauth-nossl"
-    tags: ["replicaset", "local", "%mongodbVersion%"]
+    tags: ["replicaset", "local", "%mongodbVersion%", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -22,7 +22,7 @@ tasks:
       - func: "run tests"
 
   - name: "test-mongodb-%mongodbVersion%-sharded-noauth-nossl"
-    tags: ["sharded", "local", "%mongodbVersion%"]
+    tags: ["sharded", "local", "%mongodbVersion%", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/templates/test/require-api-version.yml b/.evergreen/config/templates/test/require-api-version.yml
index b313a1924..624f71706 100644
--- a/.evergreen/config/templates/test/require-api-version.yml
+++ b/.evergreen/config/templates/test/require-api-version.yml
@@ -1,6 +1,6 @@
 tasks:
   - name: "test-mongodb-%mongodbVersion%-requireApiVersion"
-    tags: ["standalone", "local", "%mongodbVersion%", "versioned_api"]
+    tags: ["standalone", "local", "%mongodbVersion%", "versioned_api", "pr", "tag"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/tests/UnifiedSpecTests/command-monitoring/unacknowledgedBulkWrite.json b/tests/UnifiedSpecTests/command-monitoring/unacknowledgedBulkWrite.json
index 782cb84a5..40cba5636 100644
--- a/tests/UnifiedSpecTests/command-monitoring/unacknowledgedBulkWrite.json
+++ b/tests/UnifiedSpecTests/command-monitoring/unacknowledgedBulkWrite.json
@@ -70,17 +70,7 @@
           "object": "collection",
           "arguments": {
             "filter": {}
-          },
-          "expectResult": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": "unorderedBulkWriteInsertW0",
-              "x": 44
-            }
-          ]
+          }
         }
       ],
       "expectEvents": [