diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 071635949..56cee44ec 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -9,10 +9,9 @@ command_type: system
 # Fail builds when pre tasks fail.
 pre_error_fails_task: true
 
-# Protect ourselves against rogue test case that runs forever
-# Good rule of thumb: the average length a task takes, times 5, which roughly accounts for variable system performance
-# for various build variants
-exec_timeout_secs: 1800
+# Protect ourselves against rogue test case that runs forever. Tasks are killed after 10 minutes, which shouldn't occur
+# under normal circumstances.
+exec_timeout_secs: 600
 
 # These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local
 # MongoDB instances. All other tasks that require special preparation should be run from within a task group
@@ -51,33 +50,33 @@ include:
   - filename: .evergreen/config/test-variants.yml
 
   # Automatically generated files
-  - filename: .evergreen/config/build/build-php-8.2.yml
-  - filename: .evergreen/config/build/build-php-8.1.yml
-  - filename: .evergreen/config/build/build-php-8.0.yml
-  - filename: .evergreen/config/build/build-php-7.4.yml
-  - filename: .evergreen/config/test/local-latest.yml
-  - filename: .evergreen/config/test/local-rapid.yml
-  - filename: .evergreen/config/test/local-7.0.yml
-  - filename: .evergreen/config/test/local-6.0.yml
-  - filename: .evergreen/config/test/local-5.0.yml
-  - filename: .evergreen/config/test/local-4.4.yml
-  - filename: .evergreen/config/test/local-4.2.yml
-  - filename: .evergreen/config/test/local-4.0.yml
-  - filename: .evergreen/config/test/local-3.6.yml
-  - filename: .evergreen/config/test/load-balanced-latest.yml
-  - filename: .evergreen/config/test/load-balanced-rapid.yml
-  - filename: .evergreen/config/test/load-balanced-7.0.yml
-  - filename: .evergreen/config/test/load-balanced-6.0.yml
-  - filename: .evergreen/config/test/load-balanced-5.0.yml
-  - filename: .evergreen/config/test/require-api-version-latest.yml
-  - filename: .evergreen/config/test/require-api-version-rapid.yml
-  - filename: .evergreen/config/test/require-api-version-7.0.yml
-  - filename: .evergreen/config/test/require-api-version-6.0.yml
-  - filename: .evergreen/config/test/require-api-version-5.0.yml
-  - filename: .evergreen/config/test/csfle-latest.yml
-  - filename: .evergreen/config/test/csfle-rapid.yml
-  - filename: .evergreen/config/test/csfle-7.0.yml
-  - filename: .evergreen/config/test/csfle-6.0.yml
-  - filename: .evergreen/config/test/csfle-5.0.yml
-  - filename: .evergreen/config/test/csfle-4.4.yml
-  - filename: .evergreen/config/test/csfle-4.2.yml
+  - filename: .evergreen/config/generated/build/build-php-8.2.yml
+  - filename: .evergreen/config/generated/build/build-php-8.1.yml
+  - filename: .evergreen/config/generated/build/build-php-8.0.yml
+  - filename: .evergreen/config/generated/build/build-php-7.4.yml
+  - filename: .evergreen/config/generated/test/local-latest.yml
+  - filename: .evergreen/config/generated/test/local-rapid.yml
+  - filename: .evergreen/config/generated/test/local-7.0.yml
+  - filename: .evergreen/config/generated/test/local-6.0.yml
+  - filename: .evergreen/config/generated/test/local-5.0.yml
+  - filename: .evergreen/config/generated/test/local-4.4.yml
+  - filename: .evergreen/config/generated/test/local-4.2.yml
+  - filename: .evergreen/config/generated/test/local-4.0.yml
+  - filename: .evergreen/config/generated/test/local-3.6.yml
+  - filename: .evergreen/config/generated/test/load-balanced-latest.yml
+  - filename: .evergreen/config/generated/test/load-balanced-rapid.yml
+  - filename: .evergreen/config/generated/test/load-balanced-7.0.yml
+  - filename: .evergreen/config/generated/test/load-balanced-6.0.yml
+  - filename: .evergreen/config/generated/test/load-balanced-5.0.yml
+  - filename: .evergreen/config/generated/test/require-api-version-latest.yml
+  - filename: .evergreen/config/generated/test/require-api-version-rapid.yml
+  - filename: .evergreen/config/generated/test/require-api-version-7.0.yml
+  - filename: .evergreen/config/generated/test/require-api-version-6.0.yml
+  - filename: .evergreen/config/generated/test/require-api-version-5.0.yml
+  - filename: .evergreen/config/generated/test/csfle-latest.yml
+  - filename: .evergreen/config/generated/test/csfle-rapid.yml
+  - filename: .evergreen/config/generated/test/csfle-7.0.yml
+  - filename: .evergreen/config/generated/test/csfle-6.0.yml
+  - filename: .evergreen/config/generated/test/csfle-5.0.yml
+  - filename: .evergreen/config/generated/test/csfle-4.4.yml
+  - filename: .evergreen/config/generated/test/csfle-4.2.yml
diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php
index ca538e4d6..d1a6c866b 100644
--- a/.evergreen/config/generate-config.php
+++ b/.evergreen/config/generate-config.php
@@ -2,13 +2,23 @@
 <?php
 
 // Supported PHP versions. Add new versions to the beginning of the list
-$supportedPhpVersions = ['8.2', '8.1', '8.0', '7.4'];
+$supportedPhpVersions = [
+    '8.2',
+    '8.1',
+    '8.0',
+    '7.4'
+];
 
 // Supported MongoDB versions. Add new versions after "rapid"
 $supportedMongoDBVersions = [
-    'latest', 'rapid',
-    '7.0', '6.0', '5.0',
-    '4.4', '4.2', '4.0',
+    'latest',
+    'rapid',
+    '7.0',
+    '6.0',
+    '5.0',
+    '4.4',
+    '4.2',
+    '4.0',
     '3.6',
 ];
 
@@ -33,13 +43,13 @@
 $allFiles = [];
 
 // Build tasks
-$allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-extension.yml', 'build-php-%s', $supportedPhpVersions);
+$allFiles[] = generateConfigs('build', 'phpVersion', 'build-extension.yml', 'build-php-%s', $supportedPhpVersions);
 
 // Test tasks
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-local.yml', 'local-%s', $localServerVersions);
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions);
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
-$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-csfle.yml', 'csfle-%s', $csfleServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'local.yml', 'local-%s', $localServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
+$allFiles[] = generateConfigs('test', 'mongodbVersion', 'csfle.yml', 'csfle-%s', $csfleServerVersions);
 
 echo "Generated config. Use the following list to import files:\n";
 echo implode("\n", array_map('getImportConfig', array_merge(...$allFiles))) . "\n";
@@ -56,13 +66,17 @@ function generateConfigs(
     string $outputFormat,
     array $versions,
 ): array {
-    $template = file_get_contents(__DIR__ . '/' . $directory . '/' . $templateFile);
-    $header = '# This file is generated automatically - please edit the corresponding template file!';
+    $templateRelativePath = 'templates/' . $directory . '/' . $templateFile;
+    $template = file_get_contents(__DIR__ . '/' . $templateRelativePath);
+    $header = sprintf(
+        '# This file is generated automatically - please edit the "%s" template file instead.',
+        $templateRelativePath
+    );
 
     $files = [];
 
     foreach ($versions as $version) {
-        $filename = sprintf('/%s/' . $outputFormat . '.yml', $directory, $version);
+        $filename = sprintf('/generated/%s/' . $outputFormat . '.yml', $directory, $version);
         $files[] = '.evergreen/config' . $filename;
 
         $replacements = ['%' . $replacementName . '%' => $version];
@@ -72,4 +86,3 @@ function generateConfigs(
 
     return $files;
 }
-
diff --git a/.evergreen/config/build/build-php-7.4.yml b/.evergreen/config/generated/build/build-php-7.4.yml
similarity index 88%
rename from .evergreen/config/build/build-php-7.4.yml
rename to .evergreen/config/generated/build/build-php-7.4.yml
index 117327f96..c536ec27b 100644
--- a/.evergreen/config/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 corresponding template file!
+# 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"]
+    tags: ["build", "php7.4", "stable"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/build/build-php-8.0.yml b/.evergreen/config/generated/build/build-php-8.0.yml
similarity index 88%
rename from .evergreen/config/build/build-php-8.0.yml
rename to .evergreen/config/generated/build/build-php-8.0.yml
index fdd7bcfc2..c34b722ec 100644
--- a/.evergreen/config/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 corresponding template file!
+# 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"]
+    tags: ["build", "php8.0", "stable"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/build/build-php-8.1.yml b/.evergreen/config/generated/build/build-php-8.1.yml
similarity index 88%
rename from .evergreen/config/build/build-php-8.1.yml
rename to .evergreen/config/generated/build/build-php-8.1.yml
index 8eb8712b8..912f0b5c1 100644
--- a/.evergreen/config/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 corresponding template file!
+# 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"]
+    tags: ["build", "php8.1", "stable"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/build/build-php-8.2.yml b/.evergreen/config/generated/build/build-php-8.2.yml
similarity index 88%
rename from .evergreen/config/build/build-php-8.2.yml
rename to .evergreen/config/generated/build/build-php-8.2.yml
index ce7fa64a5..af7223515 100644
--- a/.evergreen/config/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 corresponding template file!
+# 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"]
+    tags: ["build", "php8.2", "stable"]
     commands:
       - func: "locate PHP binaries"
         vars:
diff --git a/.evergreen/config/test/csfle-4.2.yml b/.evergreen/config/generated/test/csfle-4.2.yml
similarity index 92%
rename from .evergreen/config/test/csfle-4.2.yml
rename to .evergreen/config/generated/test/csfle-4.2.yml
index a699a294e..a310b7fc9 100644
--- a/.evergreen/config/test/csfle-4.2.yml
+++ b/.evergreen/config/generated/test/csfle-4.2.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/csfle-4.4.yml b/.evergreen/config/generated/test/csfle-4.4.yml
similarity index 92%
rename from .evergreen/config/test/csfle-4.4.yml
rename to .evergreen/config/generated/test/csfle-4.4.yml
index f2591b9c9..291414239 100644
--- a/.evergreen/config/test/csfle-4.4.yml
+++ b/.evergreen/config/generated/test/csfle-4.4.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/csfle-5.0.yml b/.evergreen/config/generated/test/csfle-5.0.yml
similarity index 92%
rename from .evergreen/config/test/csfle-5.0.yml
rename to .evergreen/config/generated/test/csfle-5.0.yml
index 948473855..ed7bdc6fd 100644
--- a/.evergreen/config/test/csfle-5.0.yml
+++ b/.evergreen/config/generated/test/csfle-5.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/csfle-6.0.yml b/.evergreen/config/generated/test/csfle-6.0.yml
similarity index 92%
rename from .evergreen/config/test/csfle-6.0.yml
rename to .evergreen/config/generated/test/csfle-6.0.yml
index 3ce696c6f..7e8315bb4 100644
--- a/.evergreen/config/test/csfle-6.0.yml
+++ b/.evergreen/config/generated/test/csfle-6.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/csfle-7.0.yml b/.evergreen/config/generated/test/csfle-7.0.yml
similarity index 92%
rename from .evergreen/config/test/csfle-7.0.yml
rename to .evergreen/config/generated/test/csfle-7.0.yml
index 5e5e99b72..f40a9436a 100644
--- a/.evergreen/config/test/csfle-7.0.yml
+++ b/.evergreen/config/generated/test/csfle-7.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/csfle-latest.yml b/.evergreen/config/generated/test/csfle-latest.yml
similarity index 92%
rename from .evergreen/config/test/csfle-latest.yml
rename to .evergreen/config/generated/test/csfle-latest.yml
index 74ab53bf7..2c2110f22 100644
--- a/.evergreen/config/test/csfle-latest.yml
+++ b/.evergreen/config/generated/test/csfle-latest.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/csfle-rapid.yml b/.evergreen/config/generated/test/csfle-rapid.yml
similarity index 92%
rename from .evergreen/config/test/csfle-rapid.yml
rename to .evergreen/config/generated/test/csfle-rapid.yml
index 1a62a138d..18656e6c4 100644
--- a/.evergreen/config/test/csfle-rapid.yml
+++ b/.evergreen/config/generated/test/csfle-rapid.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/load-balanced-5.0.yml b/.evergreen/config/generated/test/load-balanced-5.0.yml
similarity index 74%
rename from .evergreen/config/test/load-balanced-5.0.yml
rename to .evergreen/config/generated/test/load-balanced-5.0.yml
index 689f420f9..298fd1d9b 100644
--- a/.evergreen/config/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 corresponding template file!
+# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-5.0-loadbalanced"
-    tags: ["sharded", "local", "5.0", "loadbalanced"]
+    tags: ["loadbalanced", "local", "5.0"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/test/load-balanced-6.0.yml b/.evergreen/config/generated/test/load-balanced-6.0.yml
similarity index 74%
rename from .evergreen/config/test/load-balanced-6.0.yml
rename to .evergreen/config/generated/test/load-balanced-6.0.yml
index da82ed966..08dc85242 100644
--- a/.evergreen/config/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 corresponding template file!
+# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-6.0-loadbalanced"
-    tags: ["sharded", "local", "6.0", "loadbalanced"]
+    tags: ["loadbalanced", "local", "6.0"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/test/load-balanced-7.0.yml b/.evergreen/config/generated/test/load-balanced-7.0.yml
similarity index 74%
rename from .evergreen/config/test/load-balanced-7.0.yml
rename to .evergreen/config/generated/test/load-balanced-7.0.yml
index 133105038..cfe28ac40 100644
--- a/.evergreen/config/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 corresponding template file!
+# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-7.0-loadbalanced"
-    tags: ["sharded", "local", "7.0", "loadbalanced"]
+    tags: ["loadbalanced", "local", "7.0"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/test/load-balanced-latest.yml b/.evergreen/config/generated/test/load-balanced-latest.yml
similarity index 74%
rename from .evergreen/config/test/load-balanced-latest.yml
rename to .evergreen/config/generated/test/load-balanced-latest.yml
index 910541f4d..16b197357 100644
--- a/.evergreen/config/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 corresponding template file!
+# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-latest-loadbalanced"
-    tags: ["sharded", "local", "latest", "loadbalanced"]
+    tags: ["loadbalanced", "local", "latest"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/test/load-balanced-rapid.yml b/.evergreen/config/generated/test/load-balanced-rapid.yml
similarity index 74%
rename from .evergreen/config/test/load-balanced-rapid.yml
rename to .evergreen/config/generated/test/load-balanced-rapid.yml
index 01773ed93..adc8dc096 100644
--- a/.evergreen/config/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 corresponding template file!
+# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead.
 tasks:
   - name: "test-mongodb-rapid-loadbalanced"
-    tags: ["sharded", "local", "rapid", "loadbalanced"]
+    tags: ["loadbalanced", "local", "rapid"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/test/local-3.6.yml b/.evergreen/config/generated/test/local-3.6.yml
similarity index 90%
rename from .evergreen/config/test/local-3.6.yml
rename to .evergreen/config/generated/test/local-3.6.yml
index 0c3fb9e4d..377240fc8 100644
--- a/.evergreen/config/test/local-3.6.yml
+++ b/.evergreen/config/generated/test/local-3.6.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-4.0.yml b/.evergreen/config/generated/test/local-4.0.yml
similarity index 90%
rename from .evergreen/config/test/local-4.0.yml
rename to .evergreen/config/generated/test/local-4.0.yml
index 3f817ccd7..6a12e4d68 100644
--- a/.evergreen/config/test/local-4.0.yml
+++ b/.evergreen/config/generated/test/local-4.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-4.2.yml b/.evergreen/config/generated/test/local-4.2.yml
similarity index 90%
rename from .evergreen/config/test/local-4.2.yml
rename to .evergreen/config/generated/test/local-4.2.yml
index 0a6390dec..56e6fd013 100644
--- a/.evergreen/config/test/local-4.2.yml
+++ b/.evergreen/config/generated/test/local-4.2.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-4.4.yml b/.evergreen/config/generated/test/local-4.4.yml
similarity index 90%
rename from .evergreen/config/test/local-4.4.yml
rename to .evergreen/config/generated/test/local-4.4.yml
index f26fd4a2d..5b5c31bdc 100644
--- a/.evergreen/config/test/local-4.4.yml
+++ b/.evergreen/config/generated/test/local-4.4.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-5.0.yml b/.evergreen/config/generated/test/local-5.0.yml
similarity index 90%
rename from .evergreen/config/test/local-5.0.yml
rename to .evergreen/config/generated/test/local-5.0.yml
index eeae55c3c..4dfbe6ae2 100644
--- a/.evergreen/config/test/local-5.0.yml
+++ b/.evergreen/config/generated/test/local-5.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-6.0.yml b/.evergreen/config/generated/test/local-6.0.yml
similarity index 90%
rename from .evergreen/config/test/local-6.0.yml
rename to .evergreen/config/generated/test/local-6.0.yml
index f38bcbbf9..f9ce1e68c 100644
--- a/.evergreen/config/test/local-6.0.yml
+++ b/.evergreen/config/generated/test/local-6.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-7.0.yml b/.evergreen/config/generated/test/local-7.0.yml
similarity index 90%
rename from .evergreen/config/test/local-7.0.yml
rename to .evergreen/config/generated/test/local-7.0.yml
index c0a0d3da6..77a5c9696 100644
--- a/.evergreen/config/test/local-7.0.yml
+++ b/.evergreen/config/generated/test/local-7.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-latest.yml b/.evergreen/config/generated/test/local-latest.yml
similarity index 90%
rename from .evergreen/config/test/local-latest.yml
rename to .evergreen/config/generated/test/local-latest.yml
index b9187211e..be2b0611e 100644
--- a/.evergreen/config/test/local-latest.yml
+++ b/.evergreen/config/generated/test/local-latest.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/local-rapid.yml b/.evergreen/config/generated/test/local-rapid.yml
similarity index 90%
rename from .evergreen/config/test/local-rapid.yml
rename to .evergreen/config/generated/test/local-rapid.yml
index d12ac8667..339e1ff3a 100644
--- a/.evergreen/config/test/local-rapid.yml
+++ b/.evergreen/config/generated/test/local-rapid.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# 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"]
diff --git a/.evergreen/config/test/require-api-version-5.0.yml b/.evergreen/config/generated/test/require-api-version-5.0.yml
similarity index 87%
rename from .evergreen/config/test/require-api-version-5.0.yml
rename to .evergreen/config/generated/test/require-api-version-5.0.yml
index 6911a8bc9..0a2a20fd2 100644
--- a/.evergreen/config/test/require-api-version-5.0.yml
+++ b/.evergreen/config/generated/test/require-api-version-5.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-requireApiVersion-5.0"
     tags: ["standalone", "local", "5.0", "versioned_api"]
diff --git a/.evergreen/config/test/require-api-version-6.0.yml b/.evergreen/config/generated/test/require-api-version-6.0.yml
similarity index 87%
rename from .evergreen/config/test/require-api-version-6.0.yml
rename to .evergreen/config/generated/test/require-api-version-6.0.yml
index 6de646b96..8af0b8c1a 100644
--- a/.evergreen/config/test/require-api-version-6.0.yml
+++ b/.evergreen/config/generated/test/require-api-version-6.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-requireApiVersion-6.0"
     tags: ["standalone", "local", "6.0", "versioned_api"]
diff --git a/.evergreen/config/test/require-api-version-7.0.yml b/.evergreen/config/generated/test/require-api-version-7.0.yml
similarity index 87%
rename from .evergreen/config/test/require-api-version-7.0.yml
rename to .evergreen/config/generated/test/require-api-version-7.0.yml
index 187eeaca1..74e747b7a 100644
--- a/.evergreen/config/test/require-api-version-7.0.yml
+++ b/.evergreen/config/generated/test/require-api-version-7.0.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-requireApiVersion-7.0"
     tags: ["standalone", "local", "7.0", "versioned_api"]
diff --git a/.evergreen/config/test/require-api-version-latest.yml b/.evergreen/config/generated/test/require-api-version-latest.yml
similarity index 88%
rename from .evergreen/config/test/require-api-version-latest.yml
rename to .evergreen/config/generated/test/require-api-version-latest.yml
index 623ff5248..d41d54db7 100644
--- a/.evergreen/config/test/require-api-version-latest.yml
+++ b/.evergreen/config/generated/test/require-api-version-latest.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-requireApiVersion-latest"
     tags: ["standalone", "local", "latest", "versioned_api"]
diff --git a/.evergreen/config/test/require-api-version-rapid.yml b/.evergreen/config/generated/test/require-api-version-rapid.yml
similarity index 87%
rename from .evergreen/config/test/require-api-version-rapid.yml
rename to .evergreen/config/generated/test/require-api-version-rapid.yml
index 51e2772ee..bd9015299 100644
--- a/.evergreen/config/test/require-api-version-rapid.yml
+++ b/.evergreen/config/generated/test/require-api-version-rapid.yml
@@ -1,4 +1,4 @@
-# This file is generated automatically - please edit the corresponding template file!
+# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead.
 tasks:
   - name: "test-requireApiVersion-rapid"
     tags: ["standalone", "local", "rapid", "versioned_api"]
diff --git a/.evergreen/config/build/_template-build-extension.yml b/.evergreen/config/templates/build/build-extension.yml
similarity index 100%
rename from .evergreen/config/build/_template-build-extension.yml
rename to .evergreen/config/templates/build/build-extension.yml
diff --git a/.evergreen/config/test/_template-csfle.yml b/.evergreen/config/templates/test/csfle.yml
similarity index 100%
rename from .evergreen/config/test/_template-csfle.yml
rename to .evergreen/config/templates/test/csfle.yml
diff --git a/.evergreen/config/test/_template-load-balanced.yml b/.evergreen/config/templates/test/load-balanced.yml
similarity index 87%
rename from .evergreen/config/test/_template-load-balanced.yml
rename to .evergreen/config/templates/test/load-balanced.yml
index fc7e4d1b9..ca36912ad 100644
--- a/.evergreen/config/test/_template-load-balanced.yml
+++ b/.evergreen/config/templates/test/load-balanced.yml
@@ -1,6 +1,6 @@
 tasks:
   - name: "test-mongodb-%mongodbVersion%-loadbalanced"
-    tags: ["sharded", "local", "%mongodbVersion%", "loadbalanced"]
+    tags: ["loadbalanced", "local", "%mongodbVersion%"]
     commands:
       - func: "bootstrap mongo-orchestration"
         vars:
diff --git a/.evergreen/config/test/_template-local.yml b/.evergreen/config/templates/test/local.yml
similarity index 100%
rename from .evergreen/config/test/_template-local.yml
rename to .evergreen/config/templates/test/local.yml
diff --git a/.evergreen/config/test/_template-require-api-version.yml b/.evergreen/config/templates/test/require-api-version.yml
similarity index 100%
rename from .evergreen/config/test/_template-require-api-version.yml
rename to .evergreen/config/templates/test/require-api-version.yml
diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml
index 0b19ffa60..a7246029e 100644
--- a/.evergreen/config/test-variants.yml
+++ b/.evergreen/config/test-variants.yml
@@ -19,6 +19,7 @@ buildvariants:
       - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0"
       - ".replicaset .local !.csfle !.3.6 !.4.0 !.4.2 !.4.4 !.5.0"
       - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0"
+      - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0"
       - ".serverless"
       - "test-atlas-data-lake"
   - name: test-debian92-php82-local
@@ -37,6 +38,7 @@ buildvariants:
       - ".standalone .local !.6.0 !.7.0 !.rapid !.latest"
       - ".replicaset .local !.csfle !.6.0 !.7.0 !.rapid !.latest"
       - ".sharded .local !.6.0 !.7.0 !.rapid !.latest"
+      - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest"
 
   # Test remaining PHP versions with replica sets on Debian 11 with MongoDB 7.0
   - name: test-debian11-php81-local
diff --git a/.gitattributes b/.gitattributes
index e6785c9c1..6a04e7492 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,7 +16,4 @@ psalm.xml.dist export-ignore
 psalm-baseline.xml export-ignore
 
 # Prevent generated build files from showing diffs in pull requests
-.evergreen/config/build/*.yml linguist-generated=true
-.evergreen/config/build/_template*.yml linguist-generated=false
-.evergreen/config/test/*.yml linguist-generated=true
-.evergreen/config/test/_template*.yml linguist-generated=false
+.evergreen/config/generated/** linguist-generated=true