diff --git a/.evergreen.yml b/.evergreen.yml
index 0e0b3e52e..88b9b8cfd 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -6621,7 +6621,7 @@ functions:
           AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
           AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
           DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl}
-          E2E_TASK_NAME: ${task_name_var}
+          E2E_TASK_NAME: ${task_name}
 
   ###
   # PACKAGING AND UPLOADING
@@ -11076,11 +11076,11 @@ tasks:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: e2e_tests_darwin_x64_fips
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_x64_fips"
   - name: e2e_tests_darwin_x64
     tags: ["e2e-test"]
     depends_on:
@@ -11096,11 +11096,11 @@ tasks:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_x64"
   - name: e2e_tests_darwin_x64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11116,11 +11116,11 @@ tasks:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_x64_70x_fips"
   - name: e2e_tests_darwin_x64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11136,11 +11136,11 @@ tasks:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_x64_70x"
   - name: e2e_tests_darwin_x64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11156,11 +11156,11 @@ tasks:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_x64_60x_fips"
   - name: e2e_tests_darwin_x64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11176,11 +11176,11 @@ tasks:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_x64_60x"
   - name: perf_tests_darwin_x64
     tags: ["perf-test"]
     depends_on:
@@ -11210,11 +11210,11 @@ tasks:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_arm64_fips"
   - name: e2e_tests_darwin_arm64
     tags: ["e2e-test"]
     depends_on:
@@ -11230,11 +11230,11 @@ tasks:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_arm64"
   - name: e2e_tests_darwin_arm64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11250,11 +11250,11 @@ tasks:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_arm64_70x_fips"
   - name: e2e_tests_darwin_arm64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11270,11 +11270,11 @@ tasks:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_arm64_70x"
   - name: e2e_tests_darwin_arm64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11290,11 +11290,11 @@ tasks:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_arm64_60x_fips"
   - name: e2e_tests_darwin_arm64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11310,11 +11310,11 @@ tasks:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_darwin_arm64_60x"
   - name: perf_tests_darwin_arm64
     tags: ["perf-test"]
     depends_on:
@@ -11344,11 +11344,11 @@ tasks:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_fips"
   - name: e2e_tests_linux_x64
     tags: ["e2e-test"]
     depends_on:
@@ -11364,11 +11364,11 @@ tasks:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64"
   - name: e2e_tests_linux_x64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11384,11 +11384,11 @@ tasks:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_70x_fips"
   - name: e2e_tests_linux_x64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11404,11 +11404,11 @@ tasks:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_70x"
   - name: e2e_tests_linux_x64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11424,11 +11424,11 @@ tasks:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_60x_fips"
   - name: e2e_tests_linux_x64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11444,11 +11444,11 @@ tasks:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_60x"
   - name: perf_tests_linux_x64
     tags: ["perf-test"]
     depends_on:
@@ -11478,11 +11478,11 @@ tasks:
           executable_os_id: linux-x64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl11_fips"
   - name: e2e_tests_linux_x64_openssl11
     tags: ["e2e-test"]
     depends_on:
@@ -11498,11 +11498,11 @@ tasks:
           executable_os_id: linux-x64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl11"
   - name: e2e_tests_linux_x64_openssl11_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11518,11 +11518,11 @@ tasks:
           executable_os_id: linux-x64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl11_70x_fips"
   - name: e2e_tests_linux_x64_openssl11_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11538,11 +11538,11 @@ tasks:
           executable_os_id: linux-x64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl11_70x"
   - name: e2e_tests_linux_x64_openssl11_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11558,11 +11558,11 @@ tasks:
           executable_os_id: linux-x64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl11_60x_fips"
   - name: e2e_tests_linux_x64_openssl11_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11578,11 +11578,11 @@ tasks:
           executable_os_id: linux-x64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl11_60x"
   - name: perf_tests_linux_x64_openssl11
     tags: ["perf-test"]
     depends_on:
@@ -11612,11 +11612,11 @@ tasks:
           executable_os_id: linux-x64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl3_fips"
   - name: e2e_tests_linux_x64_openssl3
     tags: ["e2e-test"]
     depends_on:
@@ -11632,11 +11632,11 @@ tasks:
           executable_os_id: linux-x64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl3"
   - name: e2e_tests_linux_x64_openssl3_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11652,11 +11652,11 @@ tasks:
           executable_os_id: linux-x64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl3_70x_fips"
   - name: e2e_tests_linux_x64_openssl3_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11672,11 +11672,11 @@ tasks:
           executable_os_id: linux-x64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl3_70x"
   - name: e2e_tests_linux_x64_openssl3_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11692,11 +11692,11 @@ tasks:
           executable_os_id: linux-x64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl3_60x_fips"
   - name: e2e_tests_linux_x64_openssl3_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11712,11 +11712,11 @@ tasks:
           executable_os_id: linux-x64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_x64_openssl3_60x"
   - name: perf_tests_linux_x64_openssl3
     tags: ["perf-test"]
     depends_on:
@@ -11746,11 +11746,11 @@ tasks:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_fips"
   - name: e2e_tests_linux_arm64
     tags: ["e2e-test"]
     depends_on:
@@ -11766,11 +11766,11 @@ tasks:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "e2e_tests_linux_arm64"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64"
   - name: e2e_tests_linux_arm64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11786,11 +11786,11 @@ tasks:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_70x_fips"
   - name: e2e_tests_linux_arm64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11806,11 +11806,11 @@ tasks:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_70x"
   - name: e2e_tests_linux_arm64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11826,11 +11826,11 @@ tasks:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_60x_fips"
   - name: e2e_tests_linux_arm64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11846,11 +11846,11 @@ tasks:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_60x"
   - name: perf_tests_linux_arm64
     tags: ["perf-test"]
     depends_on:
@@ -11880,11 +11880,11 @@ tasks:
           executable_os_id: linux-arm64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl11_fips"
   - name: e2e_tests_linux_arm64_openssl11
     tags: ["e2e-test"]
     depends_on:
@@ -11900,11 +11900,11 @@ tasks:
           executable_os_id: linux-arm64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl11"
   - name: e2e_tests_linux_arm64_openssl11_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11920,11 +11920,11 @@ tasks:
           executable_os_id: linux-arm64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl11_70x_fips"
   - name: e2e_tests_linux_arm64_openssl11_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11940,11 +11940,11 @@ tasks:
           executable_os_id: linux-arm64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl11_70x"
   - name: e2e_tests_linux_arm64_openssl11_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11960,11 +11960,11 @@ tasks:
           executable_os_id: linux-arm64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl11_60x_fips"
   - name: e2e_tests_linux_arm64_openssl11_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11980,11 +11980,11 @@ tasks:
           executable_os_id: linux-arm64-openssl11
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl11_60x"
   - name: perf_tests_linux_arm64_openssl11
     tags: ["perf-test"]
     depends_on:
@@ -12014,11 +12014,11 @@ tasks:
           executable_os_id: linux-arm64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl3_fips"
   - name: e2e_tests_linux_arm64_openssl3
     tags: ["e2e-test"]
     depends_on:
@@ -12034,11 +12034,11 @@ tasks:
           executable_os_id: linux-arm64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl3"
   - name: e2e_tests_linux_arm64_openssl3_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12054,11 +12054,11 @@ tasks:
           executable_os_id: linux-arm64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl3_70x_fips"
   - name: e2e_tests_linux_arm64_openssl3_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12074,11 +12074,11 @@ tasks:
           executable_os_id: linux-arm64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl3_70x"
   - name: e2e_tests_linux_arm64_openssl3_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12094,11 +12094,11 @@ tasks:
           executable_os_id: linux-arm64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl3_60x_fips"
   - name: e2e_tests_linux_arm64_openssl3_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12114,11 +12114,11 @@ tasks:
           executable_os_id: linux-arm64-openssl3
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_arm64_openssl3_60x"
   - name: perf_tests_linux_arm64_openssl3
     tags: ["perf-test"]
     depends_on:
@@ -12148,11 +12148,11 @@ tasks:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_ppc64le_fips"
   - name: e2e_tests_linux_ppc64le
     tags: ["e2e-test"]
     depends_on:
@@ -12168,11 +12168,11 @@ tasks:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_ppc64le"
   - name: e2e_tests_linux_ppc64le_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12188,11 +12188,11 @@ tasks:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_ppc64le_70x_fips"
   - name: e2e_tests_linux_ppc64le_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12208,11 +12208,11 @@ tasks:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_ppc64le_70x"
   - name: e2e_tests_linux_ppc64le_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12228,11 +12228,11 @@ tasks:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_ppc64le_60x_fips"
   - name: e2e_tests_linux_ppc64le_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12248,11 +12248,11 @@ tasks:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_ppc64le_60x"
   - name: perf_tests_linux_ppc64le
     tags: ["perf-test"]
     depends_on:
@@ -12282,11 +12282,11 @@ tasks:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_s390x_fips"
   - name: e2e_tests_linux_s390x
     tags: ["e2e-test"]
     depends_on:
@@ -12302,11 +12302,11 @@ tasks:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_s390x"
   - name: e2e_tests_linux_s390x_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12322,11 +12322,11 @@ tasks:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_s390x_70x_fips"
   - name: e2e_tests_linux_s390x_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12342,11 +12342,11 @@ tasks:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_s390x_70x"
   - name: e2e_tests_linux_s390x_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12362,11 +12362,11 @@ tasks:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_s390x_60x_fips"
   - name: e2e_tests_linux_s390x_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12382,11 +12382,11 @@ tasks:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_linux_s390x_60x"
   - name: perf_tests_linux_s390x
     tags: ["perf-test"]
     depends_on:
@@ -12416,11 +12416,11 @@ tasks:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_win32_fips"
   - name: e2e_tests_win32
     tags: ["e2e-test"]
     depends_on:
@@ -12436,11 +12436,11 @@ tasks:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_win32"
   - name: e2e_tests_win32_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12456,11 +12456,11 @@ tasks:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_win32_70x_fips"
   - name: e2e_tests_win32_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12476,11 +12476,11 @@ tasks:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_win32_70x"
   - name: e2e_tests_win32_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12496,11 +12496,11 @@ tasks:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_win32_60x_fips"
   - name: e2e_tests_win32_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12516,11 +12516,11 @@ tasks:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          task_name_var: "${task_name}"
           node_js_version: "20.18.0"
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_win32_60x"
   - name: perf_tests_win32
     tags: ["perf-test"]
     depends_on:
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index c0827f931..271179944 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -130,6 +130,9 @@ post:
       visibility: signed
       content_type: application/x-gzip
       optional: true
+  - command: attach.xunit_results
+    params:
+      file: src/.logs/*.xml
 
 
 # Functions are any command that can be run.
@@ -1229,6 +1232,7 @@ tasks:
           mongosh_server_test_version: "<% out(mVersion) %>-enterprise"
           mongosh_test_e2e_force_fips: "<% out(fipsVariant === 'fips' ? '1' : '') %>"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
+          task_name: "e2e_tests_<% out(executableOsId.replace(/-/g, '_')) %><% out(mVersion === 'stable' ? '' : '_' + mVersion.replace(/[^a-zA-Z0-9]/g, '')) %><% out(fipsVariant === 'fips' ? '_fips' : '') %>"
   <% } } %>
   - name: perf_tests_<% out(executableOsId.replace(/-/g, '_')) %>
     tags: ["perf-test"]