diff --git a/.evergreen.yml b/.evergreen.yml
index 5a374209c..9ae59e486 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -4945,267 +4945,278 @@ tasks:
   ###
   # E2E TESTS
   ###
-  - name: e2e_tests_darwin_x64_fips
-    tags: ["e2e-test"]
+  # Tests reuse the same compilation build variant, so we create those variations based on this.
+  - name: e2e_tests_linux_x64
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
+          executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_x64
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_x64_rhel8
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_x64_rhel8
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
+          executable_os_id: linux-x64-rhel8
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_x64_70x_fips
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_x64_openssl11
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
+          executable_os_id: linux-x64-openssl11
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_x64_70x
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_x64_openssl11_rhel8
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_x64_openssl11_rhel8
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
+          executable_os_id: linux-x64-openssl11-rhel8
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_x64_60x_fips
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_x64_openssl3
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
+          executable_os_id: linux-x64-openssl3
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_x64_60x
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_x64_openssl3_rhel8
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_x64_openssl3_rhel8
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
+          executable_os_id: linux-x64-openssl3-rhel8
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_darwin_x64
-    tags: ["perf-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_arm64
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
-      - func: run_perf_tests
-  - name: e2e_tests_darwin_arm64_fips
-    tags: ["e2e-test"]
+          executable_os_id: linux-arm64
+      - func: run_e2e_tests
+        vars:
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_arm64_openssl11
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
+          executable_os_id: linux-arm64-openssl11
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_arm64
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_arm64_openssl3
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
+          executable_os_id: linux-arm64-openssl3
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_arm64_70x_fips
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_ppc64le
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_linux_ppc64le
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
+          executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_arm64_70x
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_linux_s390x
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_linux_s390x
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
+          executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_arm64_60x_fips
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_darwin
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_darwin
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
+          executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_darwin_arm64_60x
-    tags: ["e2e-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_darwin_arm64
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_darwin_arm64
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_darwin_arm64
-    tags: ["perf-test"]
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: e2e_tests_win32
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_win32
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "20.18.1"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
-      - func: run_perf_tests
-  - name: e2e_tests_linux_x64_fips
-    tags: ["e2e-test"]
+          executable_os_id: win32
+      - func: run_e2e_tests
+        vars:
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  - name: perf_tests
+    tags: ["perf-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5213,18 +5224,17 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-      - func: run_e2e_tests
-        vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64
-    tags: ["e2e-test"]
+          executable_os_id: "linux-x64"
+      - func: run_perf_tests
+  
+  ###
+  # EXECUTABLE CONNECTIVITY TESTS
+  ###
+  - name: executable_connectivity_test_linux_x64_rocky8
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5233,17 +5243,17 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64
-      - func: run_e2e_tests
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_70x_fips
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_ubuntu2004
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5252,17 +5262,17 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64
-      - func: run_e2e_tests
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_70x
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_node20
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5271,17 +5281,17 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64
-      - func: run_e2e_tests
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_60x_fips
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.node20"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_rocky9
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5290,17 +5300,17 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64
-      - func: run_e2e_tests
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_60x
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_ubuntu2204
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5309,17 +5319,17 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64
-      - func: run_e2e_tests
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_x64
-    tags: ["perf-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_openssl11_rocky8
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5327,13 +5337,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-      - func: run_perf_tests
-  - name: e2e_tests_linux_x64_openssl11_fips
-    tags: ["e2e-test"]
+          executable_os_id: linux-x64-openssl11
+      - func: test_connectivity
+        vars:
+          node_js_version: "20.18.1"
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_openssl11_ubuntu2004
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5342,17 +5357,17 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64-openssl11
-      - func: run_e2e_tests
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl11
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_openssl3_node20
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5360,18 +5375,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl3
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl11_70x_fips
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.node20"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_openssl3_rocky9
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5379,18 +5394,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl3
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl11_70x
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_x64_openssl3_ubuntu2204
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5398,18 +5413,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl3
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl11_60x_fips
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_rocky8
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -5417,18 +5432,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl11_60x
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_ubuntu2004
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -5436,18 +5451,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_x64_openssl11
-    tags: ["perf-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_node20
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -5455,13 +5470,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: run_perf_tests
-  - name: e2e_tests_linux_x64_openssl3_fips
-    tags: ["e2e-test"]
+          executable_os_id: linux-arm64
+      - func: test_connectivity
+        vars:
+          node_js_version: "20.18.1"
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.node20"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_rocky9
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -5469,18 +5489,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl3
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_ubuntu2204
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -5488,18 +5508,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl3_70x_fips
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_openssl11_rocky8
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5507,18 +5527,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64-openssl11
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl3_70x
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_openssl11_ubuntu2004
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5526,18 +5546,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64-openssl11
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl3_60x_fips
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_openssl3_node20
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5545,18 +5565,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64-openssl3
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_x64_openssl3_60x
-    tags: ["e2e-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.node20"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_openssl3_rocky9
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5564,18 +5584,18 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-arm64-openssl3
+      - func: test_connectivity
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_x64_openssl3
-    tags: ["perf-test"]
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
+          task_name: ${task_name}
+  - name: executable_connectivity_test_linux_arm64_openssl3_ubuntu2204
+    tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5583,13 +5603,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: run_perf_tests
-  - name: e2e_tests_linux_arm64_fips
-    tags: ["e2e-test"]
+          executable_os_id: linux-arm64-openssl3
+      - func: test_connectivity
+        vars:
+          node_js_version: "20.18.1"
+          test_mongosh_executable: dist/mongosh
+          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
+          task_name: ${task_name}
+
+  ###
+  # PACKAGING
+  ###
+  - name: add_crypt_shared_and_sbom_darwin_x64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_arm64_build
+        variant: build_darwin
     commands:
       - func: checkout
       - func: install
@@ -5597,18 +5626,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64
-      - func: run_e2e_tests
+          executable_os_id: darwin-x64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64
-    tags: ["e2e-test"]
+          package_variant: darwin-x64
+          executable_os_id: darwin-x64
+      - func: upload_sbom
+        vars:
+          executable_os_id: darwin-x64
+          extra_upload_tag: -darwin-x64-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: darwin-x64
+          extra_upload_tag: -darwin-x64-complete
+  - name: package_artifact_darwin_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: add_crypt_shared_and_sbom_darwin_x64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -5616,37 +5650,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64
-      - func: run_e2e_tests
+          executable_os_id: darwin-x64
+          extra_upload_tag: -darwin-x64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_70x_fips
-    tags: ["e2e-test"]
+          package_variant: darwin-x64
+          executable_os_id: darwin-x64
+      - func: put_artifact_url
+        vars:
+          package_variant: darwin-x64
+          signature_tag: unsigned
+  - name: sign_artifact_darwin_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: package_artifact_darwin_x64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64
-      - func: run_e2e_tests
+          package_variant: darwin-x64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_70x
-    tags: ["e2e-test"]
+          package_variant: darwin-x64
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: darwin-x64
+          signature_tag: signed
+  - name: verify_artifact_darwin_x64
+    tags: ["smoke-test"]
+    depends_on:
+      - name: sign_artifact_darwin_x64
+        variant: "*"
+    commands:
+      - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: darwin-x64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_darwin_arm64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_arm64_build
+        variant: build_darwin_arm64
     commands:
       - func: checkout
       - func: install
@@ -5654,18 +5709,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64
-      - func: run_e2e_tests
+          executable_os_id: darwin-arm64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_60x_fips
-    tags: ["e2e-test"]
+          package_variant: darwin-arm64
+          executable_os_id: darwin-arm64
+      - func: upload_sbom
+        vars:
+          executable_os_id: darwin-arm64
+          extra_upload_tag: -darwin-arm64-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: darwin-arm64
+          extra_upload_tag: -darwin-arm64-complete
+  - name: package_artifact_darwin_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: add_crypt_shared_and_sbom_darwin_arm64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -5673,51 +5733,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64
-      - func: run_e2e_tests
+          executable_os_id: darwin-arm64
+          extra_upload_tag: -darwin-arm64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_60x
-    tags: ["e2e-test"]
+          package_variant: darwin-arm64
+          executable_os_id: darwin-arm64
+      - func: put_artifact_url
+        vars:
+          package_variant: darwin-arm64
+          signature_tag: unsigned
+  - name: sign_artifact_darwin_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: package_artifact_darwin_arm64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64
-      - func: run_e2e_tests
+          package_variant: darwin-arm64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_arm64
-    tags: ["perf-test"]
+          package_variant: darwin-arm64
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: darwin-arm64
+          signature_tag: signed
+  - name: verify_artifact_darwin_arm64
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: sign_artifact_darwin_arm64
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64
-      - func: run_perf_tests
-  - name: e2e_tests_linux_arm64_openssl11_fips
-    tags: ["e2e-test"]
+          package_variant: darwin-arm64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_linux_x64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_arm64_build_openssl11
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5725,18 +5792,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-x64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl11
-    tags: ["e2e-test"]
+          package_variant: linux-x64
+          executable_os_id: linux-x64
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64
+          extra_upload_tag: -linux-x64-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64
+          extra_upload_tag: -linux-x64-complete
+  - name: package_artifact_linux_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
+      - name: add_crypt_shared_and_sbom_linux_x64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -5744,56 +5816,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-x64
+          extra_upload_tag: -linux-x64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl11_70x_fips
-    tags: ["e2e-test"]
+          package_variant: linux-x64
+          executable_os_id: linux-x64
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-x64
+          signature_tag: unsigned
+  - name: sign_artifact_linux_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
+      - name: package_artifact_linux_x64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: run_e2e_tests
+          package_variant: linux-x64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl11_70x
-    tags: ["e2e-test"]
+          package_variant: linux-x64
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-x64
+          signature_tag: signed
+  - name: verify_artifact_linux_x64
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
+      - name: sign_artifact_linux_x64
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: run_e2e_tests
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl11_60x_fips
-    tags: ["e2e-test"]
+          package_variant: linux-x64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_deb_x64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_arm64_build_openssl11
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5801,37 +5875,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-x64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl11_60x
-    tags: ["e2e-test"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+          package_variant: deb-x64
+          executable_os_id: linux-x64
+      - func: upload_sbom
         vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: run_e2e_tests
+          executable_os_id: linux-x64
+          extra_upload_tag: -deb-x64-sbom
+      - func: upload_compiled_artifact
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_arm64_openssl11
-    tags: ["perf-test"]
+          executable_os_id: linux-x64
+          extra_upload_tag: -deb-x64-complete
+  - name: package_artifact_deb_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
+      - name: add_crypt_shared_and_sbom_deb_x64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -5839,70 +5899,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: run_perf_tests
-  - name: e2e_tests_linux_arm64_openssl3_fips
-    tags: ["e2e-test"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
-    commands:
-      - func: checkout
-      - func: install
+          executable_os_id: linux-x64
+          extra_upload_tag: -deb-x64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: run_e2e_tests
+          package_variant: deb-x64
+          executable_os_id: linux-x64
+      - func: put_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl3
-    tags: ["e2e-test"]
+          package_variant: deb-x64
+          signature_tag: unsigned
+  - name: sign_artifact_deb_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: package_artifact_deb_x64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: run_e2e_tests
+          package_variant: deb-x64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl3_70x_fips
-    tags: ["e2e-test"]
+          package_variant: deb-x64
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: deb-x64
+          signature_tag: signed
+  - name: verify_artifact_deb_x64
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: sign_artifact_deb_x64
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: run_e2e_tests
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl3_70x
-    tags: ["e2e-test"]
+          package_variant: deb-x64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_rpm_x64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -5910,18 +5958,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-x64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl3_60x_fips
-    tags: ["e2e-test"]
+          package_variant: rpm-x64
+          executable_os_id: linux-x64
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64
+          extra_upload_tag: -rpm-x64-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64
+          extra_upload_tag: -rpm-x64-complete
+  - name: package_artifact_rpm_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: add_crypt_shared_and_sbom_rpm_x64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -5929,51 +5982,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: run_e2e_tests
+          executable_os_id: linux-x64
+          extra_upload_tag: -rpm-x64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_arm64_openssl3_60x
-    tags: ["e2e-test"]
+          package_variant: rpm-x64
+          executable_os_id: linux-x64
+      - func: put_artifact_url
+        vars:
+          package_variant: rpm-x64
+          signature_tag: unsigned
+  - name: sign_artifact_rpm_x64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: package_artifact_rpm_x64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: run_e2e_tests
+          package_variant: rpm-x64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_arm64_openssl3
-    tags: ["perf-test"]
+          package_variant: rpm-x64
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: rpm-x64
+          signature_tag: signed
+  - name: verify_artifact_rpm_x64
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: sign_artifact_rpm_x64
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: run_perf_tests
-  - name: e2e_tests_linux_ppc64le_fips
-    tags: ["e2e-test"]
+          package_variant: rpm-x64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_linux_x64_openssl11
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_ppc64le_build
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5981,18 +6041,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-ppc64le
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl11
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_ppc64le
-    tags: ["e2e-test"]
+          package_variant: linux-x64-openssl11
+          executable_os_id: linux-x64-openssl11
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -linux-x64-openssl11-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -linux-x64-openssl11-complete
+  - name: package_artifact_linux_x64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_ppc64le_build
+      - name: add_crypt_shared_and_sbom_linux_x64_openssl11
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6000,56 +6065,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-ppc64le
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -linux-x64-openssl11-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_ppc64le_70x_fips
-    tags: ["e2e-test"]
+          package_variant: linux-x64-openssl11
+          executable_os_id: linux-x64-openssl11
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-x64-openssl11
+          signature_tag: unsigned
+  - name: sign_artifact_linux_x64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_ppc64le_build
+      - name: package_artifact_linux_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-ppc64le
-      - func: run_e2e_tests
+          package_variant: linux-x64-openssl11
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_ppc64le_70x
-    tags: ["e2e-test"]
+          package_variant: linux-x64-openssl11
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-x64-openssl11
+          signature_tag: signed
+  - name: verify_artifact_linux_x64_openssl11
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_ppc64le_build
+      - name: sign_artifact_linux_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-ppc64le
-      - func: run_e2e_tests
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_ppc64le_60x_fips
-    tags: ["e2e-test"]
+          package_variant: linux-x64-openssl11
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_deb_x64_openssl11
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_ppc64le_build
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6057,18 +6124,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-ppc64le
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl11
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_ppc64le_60x
-    tags: ["e2e-test"]
+          package_variant: deb-x64-openssl11
+          executable_os_id: linux-x64-openssl11
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -deb-x64-openssl11-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -deb-x64-openssl11-complete
+  - name: package_artifact_deb_x64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_ppc64le_build
+      - name: add_crypt_shared_and_sbom_deb_x64_openssl11
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6076,70 +6148,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-ppc64le
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -deb-x64-openssl11-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_ppc64le
-    tags: ["perf-test"]
+          package_variant: deb-x64-openssl11
+          executable_os_id: linux-x64-openssl11
+      - func: put_artifact_url
+        vars:
+          package_variant: deb-x64-openssl11
+          signature_tag: unsigned
+  - name: sign_artifact_deb_x64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_ppc64le_build
+      - name: package_artifact_deb_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-ppc64le
-      - func: run_perf_tests
-  - name: e2e_tests_linux_s390x_fips
-    tags: ["e2e-test"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_s390x_build
-    commands:
-      - func: checkout
-      - func: install
+          package_variant: deb-x64-openssl11
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+          package_variant: deb-x64-openssl11
+      - func: papertrail_trace
         vars:
-          executable_os_id: linux-s390x
-      - func: run_e2e_tests
+          product: "mongosh-dev"
+      - func: put_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_s390x
-    tags: ["e2e-test"]
+          package_variant: deb-x64-openssl11
+          signature_tag: signed
+  - name: verify_artifact_deb_x64_openssl11
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_s390x_build
+      - name: sign_artifact_deb_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-s390x
-      - func: run_e2e_tests
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_s390x_70x_fips
-    tags: ["e2e-test"]
+          package_variant: deb-x64-openssl11
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_rpm_x64_openssl11
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_s390x_build
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6147,18 +6207,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-s390x
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl11
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_s390x_70x
-    tags: ["e2e-test"]
+          package_variant: rpm-x64-openssl11
+          executable_os_id: linux-x64-openssl11
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -rpm-x64-openssl11-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -rpm-x64-openssl11-complete
+  - name: package_artifact_rpm_x64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_s390x_build
+      - name: add_crypt_shared_and_sbom_rpm_x64_openssl11
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6166,56 +6231,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-s390x
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl11
+          extra_upload_tag: -rpm-x64-openssl11-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_s390x_60x_fips
-    tags: ["e2e-test"]
+          package_variant: rpm-x64-openssl11
+          executable_os_id: linux-x64-openssl11
+      - func: put_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl11
+          signature_tag: unsigned
+  - name: sign_artifact_rpm_x64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_s390x_build
+      - name: package_artifact_rpm_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-s390x
-      - func: run_e2e_tests
+          package_variant: rpm-x64-openssl11
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_linux_s390x_60x
-    tags: ["e2e-test"]
+          package_variant: rpm-x64-openssl11
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl11
+          signature_tag: signed
+  - name: verify_artifact_rpm_x64_openssl11
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_s390x_build
+      - name: sign_artifact_rpm_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-s390x
-      - func: run_e2e_tests
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_linux_s390x
-    tags: ["perf-test"]
+          package_variant: rpm-x64-openssl11
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_linux_x64_openssl3
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_s390x_build
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6223,13 +6290,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-s390x
-      - func: run_perf_tests
-  - name: e2e_tests_win32_fips
-    tags: ["e2e-test"]
+          executable_os_id: linux-x64-openssl3
+      - func: add_crypt_shared_and_sbom
+        vars:
+          package_variant: linux-x64-openssl3
+          executable_os_id: linux-x64-openssl3
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -linux-x64-openssl3-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -linux-x64-openssl3-complete
+  - name: package_artifact_linux_x64_openssl3
     depends_on:
-      - name: compile_artifact
-        variant: win32_build
+      - name: add_crypt_shared_and_sbom_linux_x64_openssl3
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6237,56 +6314,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: win32
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -linux-x64-openssl3-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_win32
-    tags: ["e2e-test"]
+          package_variant: linux-x64-openssl3
+          executable_os_id: linux-x64-openssl3
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-x64-openssl3
+          signature_tag: unsigned
+  - name: sign_artifact_linux_x64_openssl3
     depends_on:
-      - name: compile_artifact
-        variant: win32_build
+      - name: package_artifact_linux_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: win32
-      - func: run_e2e_tests
+          package_variant: linux-x64-openssl3
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_win32_70x_fips
-    tags: ["e2e-test"]
+          package_variant: linux-x64-openssl3
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-x64-openssl3
+          signature_tag: signed
+  - name: verify_artifact_linux_x64_openssl3
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: win32_build
+      - name: sign_artifact_linux_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: win32
-      - func: run_e2e_tests
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_win32_70x
-    tags: ["e2e-test"]
+          package_variant: linux-x64-openssl3
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_deb_x64_openssl3
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: win32_build
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6294,18 +6373,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: win32
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl3
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_win32_60x_fips
-    tags: ["e2e-test"]
+          package_variant: deb-x64-openssl3
+          executable_os_id: linux-x64-openssl3
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -deb-x64-openssl3-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -deb-x64-openssl3-complete
+  - name: package_artifact_deb_x64_openssl3
     depends_on:
-      - name: compile_artifact
-        variant: win32_build
+      - name: add_crypt_shared_and_sbom_deb_x64_openssl3
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6313,55 +6397,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: win32
-      - func: run_e2e_tests
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -deb-x64-openssl3-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: e2e_tests_win32_60x
-    tags: ["e2e-test"]
+          package_variant: deb-x64-openssl3
+          executable_os_id: linux-x64-openssl3
+      - func: put_artifact_url
+        vars:
+          package_variant: deb-x64-openssl3
+          signature_tag: unsigned
+  - name: sign_artifact_deb_x64_openssl3
     depends_on:
-      - name: compile_artifact
-        variant: win32_build
+      - name: package_artifact_deb_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: win32
-      - func: run_e2e_tests
+          package_variant: deb-x64-openssl3
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          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}
-  - name: perf_tests_win32
-    tags: ["perf-test"]
+          package_variant: deb-x64-openssl3
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: deb-x64-openssl3
+          signature_tag: signed
+  - name: verify_artifact_deb_x64_openssl3
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: win32_build
+      - name: sign_artifact_deb_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: win32
-      - func: run_perf_tests
-
-  ###
-  # EXECUTABLE CONNECTIVITY TESTS
-  ###
-  - name: executable_connectivity_test_linux_x64_rocky8
-    tags: ["connectivity-test"]
+          package_variant: deb-x64-openssl3
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_rpm_x64_openssl3
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6369,18 +6456,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-      - func: test_connectivity
+          executable_os_id: linux-x64-openssl3
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_ubuntu2004
-    tags: ["connectivity-test"]
+          package_variant: rpm-x64-openssl3
+          executable_os_id: linux-x64-openssl3
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -rpm-x64-openssl3-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -rpm-x64-openssl3-complete
+  - name: package_artifact_rpm_x64_openssl3
     depends_on:
-      - name: compile_artifact
-        variant: linux_x64_build
+      - name: add_crypt_shared_and_sbom_rpm_x64_openssl3
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6388,37 +6480,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-      - func: test_connectivity
+          executable_os_id: linux-x64-openssl3
+          extra_upload_tag: -rpm-x64-openssl3-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_node20
-    tags: ["connectivity-test"]
+          package_variant: rpm-x64-openssl3
+          executable_os_id: linux-x64-openssl3
+      - func: put_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl3
+          signature_tag: unsigned
+  - name: sign_artifact_rpm_x64_openssl3
     depends_on:
-      - name: compile_artifact
-        variant: linux_x64_build
+      - name: package_artifact_rpm_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-x64
-      - func: test_connectivity
+          package_variant: rpm-x64-openssl3
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.node20"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_rocky9
-    tags: ["connectivity-test"]
+          package_variant: rpm-x64-openssl3
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl3
+          signature_tag: signed
+  - name: verify_artifact_rpm_x64_openssl3
+    tags: ["smoke-test"]
+    depends_on:
+      - name: sign_artifact_rpm_x64_openssl3
+        variant: "*"
+    commands:
+      - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl3
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_linux_arm64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -6426,18 +6539,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-      - func: test_connectivity
+          executable_os_id: linux-arm64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_ubuntu2204
-    tags: ["connectivity-test"]
+          package_variant: linux-arm64
+          executable_os_id: linux-arm64
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-arm64
+          extra_upload_tag: -linux-arm64-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-arm64
+          extra_upload_tag: -linux-arm64-complete
+  - name: package_artifact_linux_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_x64_build
+      - name: add_crypt_shared_and_sbom_linux_arm64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6445,37 +6563,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-      - func: test_connectivity
+          executable_os_id: linux-arm64
+          extra_upload_tag: -linux-arm64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_openssl11_rocky8
-    tags: ["connectivity-test"]
+          package_variant: linux-arm64
+          executable_os_id: linux-arm64
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-arm64
+          signature_tag: unsigned
+  - name: sign_artifact_linux_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_x64_build_openssl11
+      - name: package_artifact_linux_arm64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: test_connectivity
+          package_variant: linux-arm64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_openssl11_ubuntu2004
-    tags: ["connectivity-test"]
+          package_variant: linux-arm64
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-arm64
+          signature_tag: signed
+  - name: verify_artifact_linux_arm64
+    tags: ["smoke-test"]
+    depends_on:
+      - name: sign_artifact_linux_arm64
+        variant: "*"
+    commands:
+      - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: linux-arm64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_deb_arm64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -6483,18 +6622,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-      - func: test_connectivity
+          executable_os_id: linux-arm64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_openssl3_node20
-    tags: ["connectivity-test"]
+          package_variant: deb-arm64
+          executable_os_id: linux-arm64
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-arm64
+          extra_upload_tag: -deb-arm64-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-arm64
+          extra_upload_tag: -deb-arm64-complete
+  - name: package_artifact_deb_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_x64_build_openssl3
+      - name: add_crypt_shared_and_sbom_deb_arm64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6502,37 +6646,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: test_connectivity
+          executable_os_id: linux-arm64
+          extra_upload_tag: -deb-arm64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.node20"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_openssl3_rocky9
-    tags: ["connectivity-test"]
+          package_variant: deb-arm64
+          executable_os_id: linux-arm64
+      - func: put_artifact_url
+        vars:
+          package_variant: deb-arm64
+          signature_tag: unsigned
+  - name: sign_artifact_deb_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_x64_build_openssl3
+      - name: package_artifact_deb_arm64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: test_connectivity
+          package_variant: deb-arm64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_x64_openssl3_ubuntu2204
-    tags: ["connectivity-test"]
+          package_variant: deb-arm64
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: deb-arm64
+          signature_tag: signed
+  - name: verify_artifact_deb_arm64
+    tags: ["smoke-test"]
+    depends_on:
+      - name: sign_artifact_deb_arm64
+        variant: "*"
+    commands:
+      - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-arm64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_rpm_arm64
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_arm64
     commands:
       - func: checkout
       - func: install
@@ -6540,18 +6705,23 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-      - func: test_connectivity
+          executable_os_id: linux-arm64
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_rocky8
-    tags: ["connectivity-test"]
+          package_variant: rpm-arm64
+          executable_os_id: linux-arm64
+      - func: upload_sbom
+        vars:
+          executable_os_id: linux-arm64
+          extra_upload_tag: -rpm-arm64-sbom
+      - func: upload_compiled_artifact
+        vars:
+          executable_os_id: linux-arm64
+          extra_upload_tag: -rpm-arm64-complete
+  - name: package_artifact_rpm_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: add_crypt_shared_and_sbom_rpm_arm64
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6560,93 +6730,57 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-arm64
-      - func: test_connectivity
+          extra_upload_tag: -rpm-arm64-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_ubuntu2004
-    tags: ["connectivity-test"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
+          package_variant: rpm-arm64
           executable_os_id: linux-arm64
-      - func: test_connectivity
+      - func: put_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_node20
-    tags: ["connectivity-test"]
+          package_variant: rpm-arm64
+          signature_tag: unsigned
+  - name: sign_artifact_rpm_arm64
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: package_artifact_rpm_arm64
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-      - func: test_connectivity
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.node20"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_rocky9
-    tags: ["connectivity-test"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
-    commands:
-      - func: checkout
-      - func: install
+          package_variant: rpm-arm64
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+          package_variant: rpm-arm64
+      - func: papertrail_trace
         vars:
-          executable_os_id: linux-arm64
-      - func: test_connectivity
+          product: "mongosh-dev"
+      - func: put_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_ubuntu2204
-    tags: ["connectivity-test"]
+          package_variant: rpm-arm64
+          signature_tag: signed
+  - name: verify_artifact_rpm_arm64
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: sign_artifact_rpm_arm64
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-      - func: test_connectivity
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_openssl11_rocky8
-    tags: ["connectivity-test"]
+          package_variant: rpm-arm64
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_linux_arm64_openssl11
+    tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_arm64_build_openssl11
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6655,36 +6789,22 @@ tasks:
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-arm64-openssl11
-      - func: test_connectivity
-        vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky8"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_openssl11_ubuntu2004
-    tags: ["connectivity-test"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
-    commands:
-      - func: checkout
-      - func: install
+      - func: add_crypt_shared_and_sbom
         vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+          package_variant: linux-arm64-openssl11
+          executable_os_id: linux-arm64-openssl11
+      - func: upload_sbom
         vars:
           executable_os_id: linux-arm64-openssl11
-      - func: test_connectivity
+          extra_upload_tag: -linux-arm64-openssl11-sbom
+      - func: upload_compiled_artifact
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2004"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_openssl3_node20
-    tags: ["connectivity-test"]
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -linux-arm64-openssl11-complete
+  - name: package_artifact_linux_arm64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: add_crypt_shared_and_sbom_linux_arm64_openssl11
+        variant: linux_package
     commands:
       - func: checkout
       - func: install
@@ -6692,60 +6812,58 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: test_connectivity
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -linux-arm64-openssl11-complete
+      - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.node20"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_openssl3_rocky9
-    tags: ["connectivity-test"]
+          package_variant: linux-arm64-openssl11
+          executable_os_id: linux-arm64-openssl11
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-arm64-openssl11
+          signature_tag: unsigned
+  - name: sign_artifact_linux_arm64_openssl11
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: package_artifact_linux_arm64_openssl11
+        variant: "*"
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: test_connectivity
+          package_variant: linux-arm64-openssl11
+          signature_tag: unsigned
+      - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.rocky9"
-          task_name: ${task_name}
-  - name: executable_connectivity_test_linux_arm64_openssl3_ubuntu2204
-    tags: ["connectivity-test"]
+          package_variant: linux-arm64-openssl11
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-dev"
+      - func: put_artifact_url
+        vars:
+          package_variant: linux-arm64-openssl11
+          signature_tag: signed
+  - name: verify_artifact_linux_arm64_openssl11
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
+      - name: sign_artifact_linux_arm64_openssl11
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: test_connectivity
+      - func: get_artifact_url
         vars:
-          node_js_version: "20.18.1"
-          test_mongosh_executable: dist/mongosh
-          kerberos_jumphost_dockerfile: "Dockerfile.ubuntu2204"
-          task_name: ${task_name}
-
-  ###
-  # PACKAGING
-  ###
-  - name: add_crypt_shared_and_sbom_darwin_x64
+          package_variant: linux-arm64-openssl11
+          signature_tag: signed
+      - func: verify_artifact
+  - name: add_crypt_shared_and_sbom_deb_arm64_openssl11
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: darwin
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6753,22 +6871,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
+          executable_os_id: linux-arm64-openssl11
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: darwin-x64
-          executable_os_id: darwin-x64
+          package_variant: deb-arm64-openssl11
+          executable_os_id: linux-arm64-openssl11
       - func: upload_sbom
         vars:
-          executable_os_id: darwin-x64
-          extra_upload_tag: -darwin-x64-sbom
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -deb-arm64-openssl11-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
-          extra_upload_tag: -darwin-x64-complete
-  - name: package_artifact_darwin_x64
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -deb-arm64-openssl11-complete
+  - name: package_artifact_deb_arm64_openssl11
     depends_on:
-      - name: add_crypt_shared_and_sbom_darwin_x64
+      - name: add_crypt_shared_and_sbom_deb_arm64_openssl11
         variant: linux_package
     commands:
       - func: checkout
@@ -6777,20 +6895,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-x64
-          extra_upload_tag: -darwin-x64-complete
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -deb-arm64-openssl11-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: darwin-x64
-          executable_os_id: darwin-x64
+          package_variant: deb-arm64-openssl11
+          executable_os_id: linux-arm64-openssl11
       - func: put_artifact_url
         vars:
-          package_variant: darwin-x64
+          package_variant: deb-arm64-openssl11
           signature_tag: unsigned
-  - name: sign_artifact_darwin_x64
+  - name: sign_artifact_deb_arm64_openssl11
     depends_on:
-      - name: package_artifact_darwin_x64
+      - name: package_artifact_deb_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
@@ -6799,36 +6917,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: darwin-x64
+          package_variant: deb-arm64-openssl11
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: darwin-x64
+          package_variant: deb-arm64-openssl11
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: darwin-x64
+          package_variant: deb-arm64-openssl11
           signature_tag: signed
-  - name: verify_artifact_darwin_x64
+  - name: verify_artifact_deb_arm64_openssl11
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_darwin_x64
+      - name: sign_artifact_deb_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: darwin-x64
+          package_variant: deb-arm64-openssl11
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_darwin_arm64
+  - name: add_crypt_shared_and_sbom_rpm_arm64_openssl11
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: darwin_arm64
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6836,22 +6954,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
+          executable_os_id: linux-arm64-openssl11
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: darwin-arm64
-          executable_os_id: darwin-arm64
+          package_variant: rpm-arm64-openssl11
+          executable_os_id: linux-arm64-openssl11
       - func: upload_sbom
         vars:
-          executable_os_id: darwin-arm64
-          extra_upload_tag: -darwin-arm64-sbom
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -rpm-arm64-openssl11-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
-          extra_upload_tag: -darwin-arm64-complete
-  - name: package_artifact_darwin_arm64
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -rpm-arm64-openssl11-complete
+  - name: package_artifact_rpm_arm64_openssl11
     depends_on:
-      - name: add_crypt_shared_and_sbom_darwin_arm64
+      - name: add_crypt_shared_and_sbom_rpm_arm64_openssl11
         variant: linux_package
     commands:
       - func: checkout
@@ -6860,20 +6978,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: darwin-arm64
-          extra_upload_tag: -darwin-arm64-complete
+          executable_os_id: linux-arm64-openssl11
+          extra_upload_tag: -rpm-arm64-openssl11-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: darwin-arm64
-          executable_os_id: darwin-arm64
+          package_variant: rpm-arm64-openssl11
+          executable_os_id: linux-arm64-openssl11
       - func: put_artifact_url
         vars:
-          package_variant: darwin-arm64
+          package_variant: rpm-arm64-openssl11
           signature_tag: unsigned
-  - name: sign_artifact_darwin_arm64
+  - name: sign_artifact_rpm_arm64_openssl11
     depends_on:
-      - name: package_artifact_darwin_arm64
+      - name: package_artifact_rpm_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
@@ -6882,36 +7000,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: darwin-arm64
+          package_variant: rpm-arm64-openssl11
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: darwin-arm64
+          package_variant: rpm-arm64-openssl11
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: darwin-arm64
+          package_variant: rpm-arm64-openssl11
           signature_tag: signed
-  - name: verify_artifact_darwin_arm64
+  - name: verify_artifact_rpm_arm64_openssl11
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_darwin_arm64
+      - name: sign_artifact_rpm_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: darwin-arm64
+          package_variant: rpm-arm64-openssl11
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_x64
+  - name: add_crypt_shared_and_sbom_linux_arm64_openssl3
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6919,22 +7037,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
+          executable_os_id: linux-arm64-openssl3
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: linux-x64
-          executable_os_id: linux-x64
+          package_variant: linux-arm64-openssl3
+          executable_os_id: linux-arm64-openssl3
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -linux-x64-sbom
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -linux-arm64-openssl3-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -linux-x64-complete
-  - name: package_artifact_linux_x64
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -linux-arm64-openssl3-complete
+  - name: package_artifact_linux_arm64_openssl3
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_x64
+      - name: add_crypt_shared_and_sbom_linux_arm64_openssl3
         variant: linux_package
     commands:
       - func: checkout
@@ -6943,20 +7061,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -linux-x64-complete
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -linux-arm64-openssl3-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-x64
-          executable_os_id: linux-x64
+          package_variant: linux-arm64-openssl3
+          executable_os_id: linux-arm64-openssl3
       - func: put_artifact_url
         vars:
-          package_variant: linux-x64
+          package_variant: linux-arm64-openssl3
           signature_tag: unsigned
-  - name: sign_artifact_linux_x64
+  - name: sign_artifact_linux_arm64_openssl3
     depends_on:
-      - name: package_artifact_linux_x64
+      - name: package_artifact_linux_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
@@ -6965,36 +7083,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: linux-x64
+          package_variant: linux-arm64-openssl3
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-x64
+          package_variant: linux-arm64-openssl3
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: linux-x64
+          package_variant: linux-arm64-openssl3
           signature_tag: signed
-  - name: verify_artifact_linux_x64
+  - name: verify_artifact_linux_arm64_openssl3
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_x64
+      - name: sign_artifact_linux_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-x64
+          package_variant: linux-arm64-openssl3
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_deb_x64
+  - name: add_crypt_shared_and_sbom_deb_arm64_openssl3
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -7002,22 +7120,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
+          executable_os_id: linux-arm64-openssl3
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: deb-x64
-          executable_os_id: linux-x64
+          package_variant: deb-arm64-openssl3
+          executable_os_id: linux-arm64-openssl3
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -deb-x64-sbom
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -deb-arm64-openssl3-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -deb-x64-complete
-  - name: package_artifact_deb_x64
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -deb-arm64-openssl3-complete
+  - name: package_artifact_deb_arm64_openssl3
     depends_on:
-      - name: add_crypt_shared_and_sbom_deb_x64
+      - name: add_crypt_shared_and_sbom_deb_arm64_openssl3
         variant: linux_package
     commands:
       - func: checkout
@@ -7026,20 +7144,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -deb-x64-complete
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -deb-arm64-openssl3-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-x64
-          executable_os_id: linux-x64
+          package_variant: deb-arm64-openssl3
+          executable_os_id: linux-arm64-openssl3
       - func: put_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl3
           signature_tag: unsigned
-  - name: sign_artifact_deb_x64
+  - name: sign_artifact_deb_arm64_openssl3
     depends_on:
-      - name: package_artifact_deb_x64
+      - name: package_artifact_deb_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
@@ -7048,36 +7166,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl3
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl3
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl3
           signature_tag: signed
-  - name: verify_artifact_deb_x64
+  - name: verify_artifact_deb_arm64_openssl3
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_deb_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl3
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_x64
+  - name: add_crypt_shared_and_sbom_rpm_arm64_openssl3
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -7085,22 +7203,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
+          executable_os_id: linux-arm64-openssl3
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: rpm-x64
-          executable_os_id: linux-x64
+          package_variant: rpm-arm64-openssl3
+          executable_os_id: linux-arm64-openssl3
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -rpm-x64-sbom
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -rpm-arm64-openssl3-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -rpm-x64-complete
-  - name: package_artifact_rpm_x64
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -rpm-arm64-openssl3-complete
+  - name: package_artifact_rpm_arm64_openssl3
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_x64
+      - name: add_crypt_shared_and_sbom_rpm_arm64_openssl3
         variant: linux_package
     commands:
       - func: checkout
@@ -7109,20 +7227,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64
-          extra_upload_tag: -rpm-x64-complete
+          executable_os_id: linux-arm64-openssl3
+          extra_upload_tag: -rpm-arm64-openssl3-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-x64
-          executable_os_id: linux-x64
+          package_variant: rpm-arm64-openssl3
+          executable_os_id: linux-arm64-openssl3
       - func: put_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: unsigned
-  - name: sign_artifact_rpm_x64
+  - name: sign_artifact_rpm_arm64_openssl3
     depends_on:
-      - name: package_artifact_rpm_x64
+      - name: package_artifact_rpm_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
@@ -7131,36 +7249,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: signed
-  - name: verify_artifact_rpm_x64
+  - name: verify_artifact_rpm_arm64_openssl3
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_rpm_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_x64_openssl11
+  - name: add_crypt_shared_and_sbom_linux_ppc64le
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_ppc64le
     commands:
       - func: checkout
       - func: install
@@ -7168,22 +7286,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
+          executable_os_id: linux-ppc64le
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: linux-x64-openssl11
-          executable_os_id: linux-x64-openssl11
+          package_variant: linux-ppc64le
+          executable_os_id: linux-ppc64le
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -linux-x64-openssl11-sbom
+          executable_os_id: linux-ppc64le
+          extra_upload_tag: -linux-ppc64le-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -linux-x64-openssl11-complete
-  - name: package_artifact_linux_x64_openssl11
+          executable_os_id: linux-ppc64le
+          extra_upload_tag: -linux-ppc64le-complete
+  - name: package_artifact_linux_ppc64le
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_x64_openssl11
+      - name: add_crypt_shared_and_sbom_linux_ppc64le
         variant: linux_package
     commands:
       - func: checkout
@@ -7192,20 +7310,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -linux-x64-openssl11-complete
+          executable_os_id: linux-ppc64le
+          extra_upload_tag: -linux-ppc64le-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-x64-openssl11
-          executable_os_id: linux-x64-openssl11
+          package_variant: linux-ppc64le
+          executable_os_id: linux-ppc64le
       - func: put_artifact_url
         vars:
-          package_variant: linux-x64-openssl11
+          package_variant: linux-ppc64le
           signature_tag: unsigned
-  - name: sign_artifact_linux_x64_openssl11
+  - name: sign_artifact_linux_ppc64le
     depends_on:
-      - name: package_artifact_linux_x64_openssl11
+      - name: package_artifact_linux_ppc64le
         variant: "*"
     commands:
       - func: checkout
@@ -7214,36 +7332,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: linux-x64-openssl11
+          package_variant: linux-ppc64le
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-x64-openssl11
+          package_variant: linux-ppc64le
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: linux-x64-openssl11
+          package_variant: linux-ppc64le
           signature_tag: signed
-  - name: verify_artifact_linux_x64_openssl11
+  - name: verify_artifact_linux_ppc64le
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_x64_openssl11
+      - name: sign_artifact_linux_ppc64le
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-x64-openssl11
+          package_variant: linux-ppc64le
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_deb_x64_openssl11
+  - name: add_crypt_shared_and_sbom_rpm_ppc64le
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_ppc64le
     commands:
       - func: checkout
       - func: install
@@ -7251,22 +7369,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
+          executable_os_id: linux-ppc64le
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: deb-x64-openssl11
-          executable_os_id: linux-x64-openssl11
+          package_variant: rpm-ppc64le
+          executable_os_id: linux-ppc64le
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -deb-x64-openssl11-sbom
+          executable_os_id: linux-ppc64le
+          extra_upload_tag: -rpm-ppc64le-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -deb-x64-openssl11-complete
-  - name: package_artifact_deb_x64_openssl11
+          executable_os_id: linux-ppc64le
+          extra_upload_tag: -rpm-ppc64le-complete
+  - name: package_artifact_rpm_ppc64le
     depends_on:
-      - name: add_crypt_shared_and_sbom_deb_x64_openssl11
+      - name: add_crypt_shared_and_sbom_rpm_ppc64le
         variant: linux_package
     commands:
       - func: checkout
@@ -7275,20 +7393,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -deb-x64-openssl11-complete
+          executable_os_id: linux-ppc64le
+          extra_upload_tag: -rpm-ppc64le-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-x64-openssl11
-          executable_os_id: linux-x64-openssl11
+          package_variant: rpm-ppc64le
+          executable_os_id: linux-ppc64le
       - func: put_artifact_url
         vars:
-          package_variant: deb-x64-openssl11
+          package_variant: rpm-ppc64le
           signature_tag: unsigned
-  - name: sign_artifact_deb_x64_openssl11
+  - name: sign_artifact_rpm_ppc64le
     depends_on:
-      - name: package_artifact_deb_x64_openssl11
+      - name: package_artifact_rpm_ppc64le
         variant: "*"
     commands:
       - func: checkout
@@ -7297,36 +7415,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64-openssl11
+          package_variant: rpm-ppc64le
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-x64-openssl11
+          package_variant: rpm-ppc64le
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: deb-x64-openssl11
+          package_variant: rpm-ppc64le
           signature_tag: signed
-  - name: verify_artifact_deb_x64_openssl11
+  - name: verify_artifact_rpm_ppc64le
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64_openssl11
+      - name: sign_artifact_rpm_ppc64le
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64-openssl11
+          package_variant: rpm-ppc64le
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_x64_openssl11
+  - name: add_crypt_shared_and_sbom_linux_s390x
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl11
+        variant: build_linux_s390x
     commands:
       - func: checkout
       - func: install
@@ -7334,22 +7452,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
+          executable_os_id: linux-s390x
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: rpm-x64-openssl11
-          executable_os_id: linux-x64-openssl11
+          package_variant: linux-s390x
+          executable_os_id: linux-s390x
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -rpm-x64-openssl11-sbom
+          executable_os_id: linux-s390x
+          extra_upload_tag: -linux-s390x-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -rpm-x64-openssl11-complete
-  - name: package_artifact_rpm_x64_openssl11
+          executable_os_id: linux-s390x
+          extra_upload_tag: -linux-s390x-complete
+  - name: package_artifact_linux_s390x
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_x64_openssl11
+      - name: add_crypt_shared_and_sbom_linux_s390x
         variant: linux_package
     commands:
       - func: checkout
@@ -7358,20 +7476,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl11
-          extra_upload_tag: -rpm-x64-openssl11-complete
+          executable_os_id: linux-s390x
+          extra_upload_tag: -linux-s390x-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-x64-openssl11
-          executable_os_id: linux-x64-openssl11
+          package_variant: linux-s390x
+          executable_os_id: linux-s390x
       - func: put_artifact_url
         vars:
-          package_variant: rpm-x64-openssl11
+          package_variant: linux-s390x
           signature_tag: unsigned
-  - name: sign_artifact_rpm_x64_openssl11
+  - name: sign_artifact_linux_s390x
     depends_on:
-      - name: package_artifact_rpm_x64_openssl11
+      - name: package_artifact_linux_s390x
         variant: "*"
     commands:
       - func: checkout
@@ -7380,36 +7498,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64-openssl11
+          package_variant: linux-s390x
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-x64-openssl11
+          package_variant: linux-s390x
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: rpm-x64-openssl11
+          package_variant: linux-s390x
           signature_tag: signed
-  - name: verify_artifact_rpm_x64_openssl11
+  - name: verify_artifact_linux_s390x
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64_openssl11
+      - name: sign_artifact_linux_s390x
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64-openssl11
+          package_variant: linux-s390x
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_x64_openssl3
+  - name: add_crypt_shared_and_sbom_rpm_s390x
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_linux_s390x
     commands:
       - func: checkout
       - func: install
@@ -7417,22 +7535,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
+          executable_os_id: linux-s390x
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: linux-x64-openssl3
-          executable_os_id: linux-x64-openssl3
+          package_variant: rpm-s390x
+          executable_os_id: linux-s390x
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -linux-x64-openssl3-sbom
+          executable_os_id: linux-s390x
+          extra_upload_tag: -rpm-s390x-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -linux-x64-openssl3-complete
-  - name: package_artifact_linux_x64_openssl3
+          executable_os_id: linux-s390x
+          extra_upload_tag: -rpm-s390x-complete
+  - name: package_artifact_rpm_s390x
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_x64_openssl3
+      - name: add_crypt_shared_and_sbom_rpm_s390x
         variant: linux_package
     commands:
       - func: checkout
@@ -7441,20 +7559,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -linux-x64-openssl3-complete
+          executable_os_id: linux-s390x
+          extra_upload_tag: -rpm-s390x-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-x64-openssl3
-          executable_os_id: linux-x64-openssl3
+          package_variant: rpm-s390x
+          executable_os_id: linux-s390x
       - func: put_artifact_url
         vars:
-          package_variant: linux-x64-openssl3
+          package_variant: rpm-s390x
           signature_tag: unsigned
-  - name: sign_artifact_linux_x64_openssl3
+  - name: sign_artifact_rpm_s390x
     depends_on:
-      - name: package_artifact_linux_x64_openssl3
+      - name: package_artifact_rpm_s390x
         variant: "*"
     commands:
       - func: checkout
@@ -7463,36 +7581,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: linux-x64-openssl3
+          package_variant: rpm-s390x
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-x64-openssl3
+          package_variant: rpm-s390x
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: linux-x64-openssl3
+          package_variant: rpm-s390x
           signature_tag: signed
-  - name: verify_artifact_linux_x64_openssl3
+  - name: verify_artifact_rpm_s390x
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_x64_openssl3
+      - name: sign_artifact_rpm_s390x
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-x64-openssl3
+          package_variant: rpm-s390x
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_deb_x64_openssl3
+  - name: add_crypt_shared_and_sbom_win32_x64
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_win32
     commands:
       - func: checkout
       - func: install
@@ -7500,22 +7618,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
+          executable_os_id: win32
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: deb-x64-openssl3
-          executable_os_id: linux-x64-openssl3
+          package_variant: win32-x64
+          executable_os_id: win32
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -deb-x64-openssl3-sbom
+          executable_os_id: win32
+          extra_upload_tag: -win32-x64-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -deb-x64-openssl3-complete
-  - name: package_artifact_deb_x64_openssl3
+          executable_os_id: win32
+          extra_upload_tag: -win32-x64-complete
+  - name: package_artifact_win32_x64
     depends_on:
-      - name: add_crypt_shared_and_sbom_deb_x64_openssl3
+      - name: add_crypt_shared_and_sbom_win32_x64
         variant: linux_package
     commands:
       - func: checkout
@@ -7524,20 +7642,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -deb-x64-openssl3-complete
+          executable_os_id: win32
+          extra_upload_tag: -win32-x64-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-x64-openssl3
-          executable_os_id: linux-x64-openssl3
+          package_variant: win32-x64
+          executable_os_id: win32
       - func: put_artifact_url
         vars:
-          package_variant: deb-x64-openssl3
+          package_variant: win32-x64
           signature_tag: unsigned
-  - name: sign_artifact_deb_x64_openssl3
+  - name: sign_artifact_win32_x64
     depends_on:
-      - name: package_artifact_deb_x64_openssl3
+      - name: package_artifact_win32_x64
         variant: "*"
     commands:
       - func: checkout
@@ -7546,36 +7664,36 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64-openssl3
+          package_variant: win32-x64
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-x64-openssl3
+          package_variant: win32-x64
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: deb-x64-openssl3
+          package_variant: win32-x64
           signature_tag: signed
-  - name: verify_artifact_deb_x64_openssl3
+  - name: verify_artifact_win32_x64
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64_openssl3
+      - name: sign_artifact_win32_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64-openssl3
+          package_variant: win32-x64
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_x64_openssl3
+  - name: add_crypt_shared_and_sbom_win32msi_x64
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: linux_x64_build_openssl3
+        variant: build_win32
     commands:
       - func: checkout
       - func: install
@@ -7583,22 +7701,22 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
+          executable_os_id: win32
       - func: add_crypt_shared_and_sbom
         vars:
-          package_variant: rpm-x64-openssl3
-          executable_os_id: linux-x64-openssl3
+          package_variant: win32msi-x64
+          executable_os_id: win32
       - func: upload_sbom
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -rpm-x64-openssl3-sbom
+          executable_os_id: win32
+          extra_upload_tag: -win32msi-x64-sbom
       - func: upload_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -rpm-x64-openssl3-complete
-  - name: package_artifact_rpm_x64_openssl3
+          executable_os_id: win32
+          extra_upload_tag: -win32msi-x64-complete
+  - name: package_artifact_win32msi_x64
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_x64_openssl3
+      - name: add_crypt_shared_and_sbom_win32msi_x64
         variant: linux_package
     commands:
       - func: checkout
@@ -7607,20 +7725,20 @@ tasks:
           node_js_version: "20.18.1"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: linux-x64-openssl3
-          extra_upload_tag: -rpm-x64-openssl3-complete
+          executable_os_id: win32
+          extra_upload_tag: -win32msi-x64-complete
       - func: package_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-x64-openssl3
-          executable_os_id: linux-x64-openssl3
+          package_variant: win32msi-x64
+          executable_os_id: win32
       - func: put_artifact_url
         vars:
-          package_variant: rpm-x64-openssl3
+          package_variant: win32msi-x64
           signature_tag: unsigned
-  - name: sign_artifact_rpm_x64_openssl3
+  - name: sign_artifact_win32msi_x64
     depends_on:
-      - name: package_artifact_rpm_x64_openssl3
+      - name: package_artifact_win32msi_x64
         variant: "*"
     commands:
       - func: checkout
@@ -7629,1316 +7747,971 @@ tasks:
           node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64-openssl3
+          package_variant: win32msi-x64
           signature_tag: unsigned
       - func: sign_artifact
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-x64-openssl3
+          package_variant: win32msi-x64
       - func: papertrail_trace
         vars:
           product: "mongosh-dev"
       - func: put_artifact_url
         vars:
-          package_variant: rpm-x64-openssl3
+          package_variant: win32msi-x64
           signature_tag: signed
-  - name: verify_artifact_rpm_x64_openssl3
+  - name: verify_artifact_win32msi_x64
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64_openssl3
+      - name: sign_artifact_win32msi_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64-openssl3
+          package_variant: win32msi-x64
           signature_tag: signed
       - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_arm64
-    tags: ["add-sbom-task"]
+
+  ###
+  # SMOKE TESTS
+  ###
+  - name: pkg_test_macos_darwin_x64
+    tags: ["smoke-test"]
     depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
+      - name: sign_artifact_darwin_x64
+        variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: linux-arm64
-          executable_os_id: linux-arm64
-      - func: upload_sbom
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -linux-arm64-sbom
-      - func: upload_compiled_artifact
+          package_variant: darwin-x64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: test_artifact_macos
+  - name: pkg_test_macos_darwin_arm64
+    tags: ["smoke-test"]
+    depends_on:
+      - name: sign_artifact_darwin_arm64
+        variant: "*"
+    commands:
+      - func: checkout
+      - func: get_artifact_url
         vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -linux-arm64-complete
-  - name: package_artifact_linux_arm64
+          package_variant: darwin-arm64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: test_artifact_macos
+  - name: pkg_test_docker_linux_x64_ubuntu20_04_tgz
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_arm64
-        variant: linux_package
+      - name: sign_artifact_linux_x64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: linux-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -linux-arm64-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-arm64
-          executable_os_id: linux-arm64
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-arm64
-          signature_tag: unsigned
-  - name: sign_artifact_linux_arm64
+          dockerfile: ubuntu20.04-tgz
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_ubuntu18_04_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_linux_arm64
+      - name: sign_artifact_deb_x64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: linux-arm64
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: deb-x64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-arm64
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: linux-arm64
-          signature_tag: signed
-  - name: verify_artifact_linux_arm64
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu18.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_ubuntu20_04_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_arm64
+      - name: sign_artifact_deb_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-arm64
+          package_variant: deb-x64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_deb_arm64
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: deb-arm64
-          executable_os_id: linux-arm64
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -deb-arm64-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -deb-arm64-complete
-  - name: package_artifact_deb_arm64
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu20.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_ubuntu22_04_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_deb_arm64
-        variant: linux_package
+      - name: sign_artifact_deb_x64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -deb-arm64-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-arm64
-          executable_os_id: linux-arm64
-      - func: put_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: unsigned
-  - name: sign_artifact_deb_arm64
+          dockerfile: ubuntu22.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_ubuntu22_04_nohome_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_deb_arm64
+      - name: sign_artifact_deb_x64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: deb-arm64
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: deb-x64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-arm64
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-  - name: verify_artifact_deb_arm64
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu22.04-nohome-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_ubuntu22_04_qemu_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_arm64
+      - name: sign_artifact_deb_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-arm64
+          package_variant: deb-x64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_arm64
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: rpm-arm64
-          executable_os_id: linux-arm64
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -rpm-arm64-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -rpm-arm64-complete
-  - name: package_artifact_rpm_arm64
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu22.04-qemu-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_ubuntu24_04_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_arm64
-        variant: linux_package
+      - name: sign_artifact_deb_x64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64
-          extra_upload_tag: -rpm-arm64-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-arm64
-          executable_os_id: linux-arm64
-      - func: put_artifact_url
-        vars:
-          package_variant: rpm-arm64
-          signature_tag: unsigned
-  - name: sign_artifact_rpm_arm64
+          dockerfile: ubuntu24.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_debian10_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_rpm_arm64
+      - name: sign_artifact_deb_x64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: rpm-arm64
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: deb-x64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-arm64
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: rpm-arm64
-          signature_tag: signed
-  - name: verify_artifact_rpm_arm64
+          node_js_version: "20.18.1"
+          dockerfile: debian10-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_debian11_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_arm64
+      - name: sign_artifact_deb_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-arm64
+          package_variant: deb-x64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_arm64_openssl11
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: linux-arm64-openssl11
-          executable_os_id: linux-arm64-openssl11
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -linux-arm64-openssl11-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -linux-arm64-openssl11-complete
-  - name: package_artifact_linux_arm64_openssl11
+          node_js_version: "20.18.1"
+          dockerfile: debian11-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_debian12_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_arm64_openssl11
-        variant: linux_package
+      - name: sign_artifact_deb_x64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -linux-arm64-openssl11-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-arm64-openssl11
-          executable_os_id: linux-arm64-openssl11
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-arm64-openssl11
-          signature_tag: unsigned
-  - name: sign_artifact_linux_arm64_openssl11
+          dockerfile: debian12-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_centos7_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_linux_arm64_openssl11
+      - name: sign_artifact_rpm_x64
         variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: get_artifact_url
-        vars:
-          package_variant: linux-arm64-openssl11
-          signature_tag: unsigned
-      - func: sign_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-arm64-openssl11
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-arm64-openssl11
-          signature_tag: signed
-  - name: verify_artifact_linux_arm64_openssl11
+          dockerfile: centos7-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_amazonlinux2_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_arm64_openssl11
+      - name: sign_artifact_rpm_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-arm64-openssl11
+          package_variant: rpm-x64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_deb_arm64_openssl11
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: deb-arm64-openssl11
-          executable_os_id: linux-arm64-openssl11
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -deb-arm64-openssl11-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -deb-arm64-openssl11-complete
-  - name: package_artifact_deb_arm64_openssl11
+          node_js_version: "20.18.1"
+          dockerfile: amazonlinux2-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_amazonlinux2023_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_deb_arm64_openssl11
-        variant: linux_package
+      - name: sign_artifact_rpm_x64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -deb-arm64-openssl11-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-arm64-openssl11
-          executable_os_id: linux-arm64-openssl11
-      - func: put_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl11
-          signature_tag: unsigned
-  - name: sign_artifact_deb_arm64_openssl11
+          dockerfile: amazonlinux2023-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_rocky8_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_deb_arm64_openssl11
+      - name: sign_artifact_rpm_x64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: deb-arm64-openssl11
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: rpm-x64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-arm64-openssl11
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: deb-arm64-openssl11
-          signature_tag: signed
-  - name: verify_artifact_deb_arm64_openssl11
+          node_js_version: "20.18.1"
+          dockerfile: rocky8-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_rocky9_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_arm64_openssl11
+      - name: sign_artifact_rpm_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-arm64-openssl11
+          package_variant: rpm-x64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_arm64_openssl11
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl11
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl11
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: rpm-arm64-openssl11
-          executable_os_id: linux-arm64-openssl11
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -rpm-arm64-openssl11-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -rpm-arm64-openssl11-complete
-  - name: package_artifact_rpm_arm64_openssl11
+          node_js_version: "20.18.1"
+          dockerfile: rocky9-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_fedora34_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_arm64_openssl11
-        variant: linux_package
+      - name: sign_artifact_rpm_x64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl11
-          extra_upload_tag: -rpm-arm64-openssl11-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-arm64-openssl11
-          executable_os_id: linux-arm64-openssl11
-      - func: put_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl11
-          signature_tag: unsigned
-  - name: sign_artifact_rpm_arm64_openssl11
+          dockerfile: fedora34-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_suse12_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_rpm_arm64_openssl11
+      - name: sign_artifact_rpm_x64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: rpm-arm64-openssl11
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: rpm-x64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-arm64-openssl11
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: rpm-arm64-openssl11
-          signature_tag: signed
-  - name: verify_artifact_rpm_arm64_openssl11
+          node_js_version: "20.18.1"
+          dockerfile: suse12-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_suse15_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_arm64_openssl11
+      - name: sign_artifact_rpm_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-arm64-openssl11
+          package_variant: rpm-x64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_arm64_openssl3
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: linux-arm64-openssl3
-          executable_os_id: linux-arm64-openssl3
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -linux-arm64-openssl3-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -linux-arm64-openssl3-complete
-  - name: package_artifact_linux_arm64_openssl3
+          node_js_version: "20.18.1"
+          dockerfile: suse15-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_oraclelinux9_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_arm64_openssl3
-        variant: linux_package
+      - name: sign_artifact_rpm_x64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -linux-arm64-openssl3-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-arm64-openssl3
-          executable_os_id: linux-arm64-openssl3
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-arm64-openssl3
-          signature_tag: unsigned
-  - name: sign_artifact_linux_arm64_openssl3
+          dockerfile: oraclelinux9-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_openssl11_ubuntu20_04_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_linux_arm64_openssl3
+      - name: sign_artifact_deb_x64_openssl11
         variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-x64-openssl11
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: get_artifact_url
-        vars:
-          package_variant: linux-arm64-openssl3
-          signature_tag: unsigned
-      - func: sign_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-arm64-openssl3
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-arm64-openssl3
-          signature_tag: signed
-  - name: verify_artifact_linux_arm64_openssl3
+          dockerfile: ubuntu20.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_openssl11_debian10_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_arm64_openssl3
+      - name: sign_artifact_deb_x64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-arm64-openssl3
+          package_variant: deb-x64-openssl11
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_deb_arm64_openssl3
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: deb-arm64-openssl3
-          executable_os_id: linux-arm64-openssl3
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -deb-arm64-openssl3-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -deb-arm64-openssl3-complete
-  - name: package_artifact_deb_arm64_openssl3
+          node_js_version: "20.18.1"
+          dockerfile: debian10-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_openssl11_debian11_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_deb_arm64_openssl3
-        variant: linux_package
+      - name: sign_artifact_deb_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-x64-openssl11
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -deb-arm64-openssl3-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-arm64-openssl3
-          executable_os_id: linux-arm64-openssl3
-      - func: put_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl3
-          signature_tag: unsigned
-  - name: sign_artifact_deb_arm64_openssl3
+          dockerfile: debian11-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl11_centos7_epel_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_deb_arm64_openssl3
+      - name: sign_artifact_rpm_x64_openssl11
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: deb-arm64-openssl3
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: rpm-x64-openssl11
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: deb-arm64-openssl3
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: deb-arm64-openssl3
-          signature_tag: signed
-  - name: verify_artifact_deb_arm64_openssl3
+          node_js_version: "20.18.1"
+          dockerfile: centos7-epel-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl11_amazonlinux2_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_arm64_openssl3
+      - name: sign_artifact_rpm_x64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-arm64-openssl3
+          package_variant: rpm-x64-openssl11
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_arm64_openssl3
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_arm64_build_openssl3
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: rpm-arm64-openssl3
-          executable_os_id: linux-arm64-openssl3
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -rpm-arm64-openssl3-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -rpm-arm64-openssl3-complete
-  - name: package_artifact_rpm_arm64_openssl3
+          node_js_version: "20.18.1"
+          dockerfile: amazonlinux2-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl11_rocky8_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_arm64_openssl3
-        variant: linux_package
+      - name: sign_artifact_rpm_x64_openssl11
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl11
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-arm64-openssl3
-          extra_upload_tag: -rpm-arm64-openssl3-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-arm64-openssl3
-          executable_os_id: linux-arm64-openssl3
-      - func: put_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl3
-          signature_tag: unsigned
-  - name: sign_artifact_rpm_arm64_openssl3
+          dockerfile: rocky8-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl11_rocky9_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_rpm_arm64_openssl3
+      - name: sign_artifact_rpm_x64_openssl11
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: rpm-arm64-openssl3
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: rpm-x64-openssl11
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-arm64-openssl3
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: rpm-arm64-openssl3
-          signature_tag: signed
-  - name: verify_artifact_rpm_arm64_openssl3
+          node_js_version: "20.18.1"
+          dockerfile: rocky9-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl11_fedora34_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_arm64_openssl3
+      - name: sign_artifact_rpm_x64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-arm64-openssl3
+          package_variant: rpm-x64-openssl11
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_ppc64le
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_ppc64le_build
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-ppc64le
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: linux-ppc64le
-          executable_os_id: linux-ppc64le
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-ppc64le
-          extra_upload_tag: -linux-ppc64le-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-ppc64le
-          extra_upload_tag: -linux-ppc64le-complete
-  - name: package_artifact_linux_ppc64le
+          node_js_version: "20.18.1"
+          dockerfile: fedora34-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_openssl3_ubuntu22_04_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_ppc64le
-        variant: linux_package
+      - name: sign_artifact_deb_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-x64-openssl3
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-ppc64le
-          extra_upload_tag: -linux-ppc64le-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-ppc64le
-          executable_os_id: linux-ppc64le
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-ppc64le
-          signature_tag: unsigned
-  - name: sign_artifact_linux_ppc64le
+          dockerfile: ubuntu22.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_openssl3_ubuntu22_04_fips_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_linux_ppc64le
+      - name: sign_artifact_deb_x64_openssl3
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: linux-ppc64le
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: deb-x64-openssl3
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-ppc64le
-      - func: papertrail_trace
+      - func: test_artifact_docker
         vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-ppc64le
-          signature_tag: signed
-  - name: verify_artifact_linux_ppc64le
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu22.04-fips-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_x64_openssl3_debian12_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_ppc64le
+      - name: sign_artifact_deb_x64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-ppc64le
+          package_variant: deb-x64-openssl3
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_ppc64le
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_ppc64le_build
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-ppc64le
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: rpm-ppc64le
-          executable_os_id: linux-ppc64le
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-ppc64le
-          extra_upload_tag: -rpm-ppc64le-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-ppc64le
-          extra_upload_tag: -rpm-ppc64le-complete
-  - name: package_artifact_rpm_ppc64le
+          node_js_version: "20.18.1"
+          dockerfile: debian12-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl3_rocky8_epel_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_ppc64le
-        variant: linux_package
+      - name: sign_artifact_rpm_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl3
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-ppc64le
-          extra_upload_tag: -rpm-ppc64le-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-ppc64le
-          executable_os_id: linux-ppc64le
-      - func: put_artifact_url
-        vars:
-          package_variant: rpm-ppc64le
-          signature_tag: unsigned
-  - name: sign_artifact_rpm_ppc64le
+          dockerfile: rocky8-epel-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl3_rocky9_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_rpm_ppc64le
+      - name: sign_artifact_rpm_x64_openssl3
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: rpm-ppc64le
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: rpm-x64-openssl3
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-ppc64le
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: rpm-ppc64le
-          signature_tag: signed
-  - name: verify_artifact_rpm_ppc64le
+          node_js_version: "20.18.1"
+          dockerfile: rocky9-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl3_rocky9_fips_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_ppc64le
+      - name: sign_artifact_rpm_x64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-ppc64le
+          package_variant: rpm-x64-openssl3
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_linux_s390x
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_s390x_build
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-s390x
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: linux-s390x
-          executable_os_id: linux-s390x
-      - func: upload_sbom
-        vars:
-          executable_os_id: linux-s390x
-          extra_upload_tag: -linux-s390x-sbom
-      - func: upload_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-s390x
-          extra_upload_tag: -linux-s390x-complete
-  - name: package_artifact_linux_s390x
+          node_js_version: "20.18.1"
+          dockerfile: rocky9-fips-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_x64_openssl3_amazonlinux2023_rpm
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_linux_s390x
-        variant: linux_package
+      - name: sign_artifact_rpm_x64_openssl3
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: rpm-x64-openssl3
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-s390x
-          extra_upload_tag: -linux-s390x-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-s390x
-          executable_os_id: linux-s390x
-      - func: put_artifact_url
-        vars:
-          package_variant: linux-s390x
-          signature_tag: unsigned
-  - name: sign_artifact_linux_s390x
+          dockerfile: amazonlinux2023-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_linux_arm64_ubuntu20_04_tgz
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_linux_s390x
+      - name: sign_artifact_linux_arm64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: linux-s390x
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: linux-arm64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: linux-s390x
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: linux-s390x
-          signature_tag: signed
-  - name: verify_artifact_linux_s390x
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu20.04-tgz
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_ubuntu18_04_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_s390x
+      - name: sign_artifact_deb_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-s390x
+          package_variant: deb-arm64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_rpm_s390x
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: linux_s390x_build
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-s390x
-      - func: add_crypt_shared_and_sbom
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu18.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_ubuntu20_04_deb
+    tags: ["smoke-test"]
+    depends_on:
+      - name: sign_artifact_deb_arm64
+        variant: "*"
+    commands:
+      - func: checkout
+      - func: get_artifact_url
         vars:
-          package_variant: rpm-s390x
-          executable_os_id: linux-s390x
-      - func: upload_sbom
+          package_variant: deb-arm64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
-          executable_os_id: linux-s390x
-          extra_upload_tag: -rpm-s390x-sbom
-      - func: upload_compiled_artifact
+          node_js_version: "20.18.1"
+      - func: test_artifact_docker
         vars:
-          executable_os_id: linux-s390x
-          extra_upload_tag: -rpm-s390x-complete
-  - name: package_artifact_rpm_s390x
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu20.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_ubuntu22_04_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: add_crypt_shared_and_sbom_rpm_s390x
-        variant: linux_package
+      - name: sign_artifact_deb_arm64
+        variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-arm64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: linux-s390x
-          extra_upload_tag: -rpm-s390x-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-s390x
-          executable_os_id: linux-s390x
-      - func: put_artifact_url
-        vars:
-          package_variant: rpm-s390x
-          signature_tag: unsigned
-  - name: sign_artifact_rpm_s390x
+          dockerfile: ubuntu22.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_ubuntu22_04_nohome_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_rpm_s390x
+      - name: sign_artifact_deb_arm64
         variant: "*"
     commands:
       - func: checkout
+      - func: get_artifact_url
+        vars:
+          package_variant: deb-arm64
+          signature_tag: signed
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-s390x
-          signature_tag: unsigned
-      - func: sign_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: rpm-s390x
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
-        vars:
-          package_variant: rpm-s390x
-          signature_tag: signed
-  - name: verify_artifact_rpm_s390x
+          dockerfile: ubuntu22.04-nohome-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_ubuntu22_04_qemu_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_s390x
+      - name: sign_artifact_deb_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-s390x
+          package_variant: deb-arm64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_win32_x64
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: win32_build
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: win32
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: win32-x64
-          executable_os_id: win32
-      - func: upload_sbom
-        vars:
-          executable_os_id: win32
-          extra_upload_tag: -win32-x64-sbom
-      - func: upload_compiled_artifact
-        vars:
-          executable_os_id: win32
-          extra_upload_tag: -win32-x64-complete
-  - name: package_artifact_win32_x64
-    depends_on:
-      - name: add_crypt_shared_and_sbom_win32_x64
-        variant: linux_package
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: win32
-          extra_upload_tag: -win32-x64-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: win32-x64
-          executable_os_id: win32
-      - func: put_artifact_url
-        vars:
-          package_variant: win32-x64
-          signature_tag: unsigned
-  - name: sign_artifact_win32_x64
+          dockerfile: ubuntu22.04-qemu-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_ubuntu24_04_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_win32_x64
+      - name: sign_artifact_deb_arm64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: win32-x64
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: deb-arm64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: win32-x64
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: win32-x64
-          signature_tag: signed
-  - name: verify_artifact_win32_x64
+          node_js_version: "20.18.1"
+          dockerfile: ubuntu24.04-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_debian10_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_win32_x64
+      - name: sign_artifact_deb_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: win32-x64
+          package_variant: deb-arm64
           signature_tag: signed
-      - func: verify_artifact
-  - name: add_crypt_shared_and_sbom_win32msi_x64
-    tags: ["add-sbom-task"]
-    depends_on:
-      - name: compile_artifact
-        variant: win32_build
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: win32
-      - func: add_crypt_shared_and_sbom
-        vars:
-          package_variant: win32msi-x64
-          executable_os_id: win32
-      - func: upload_sbom
-        vars:
-          executable_os_id: win32
-          extra_upload_tag: -win32msi-x64-sbom
-      - func: upload_compiled_artifact
-        vars:
-          executable_os_id: win32
-          extra_upload_tag: -win32msi-x64-complete
-  - name: package_artifact_win32msi_x64
-    depends_on:
-      - name: add_crypt_shared_and_sbom_win32msi_x64
-        variant: linux_package
-    commands:
-      - func: checkout
+      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: download_compiled_artifact
-        vars:
-          executable_os_id: win32
-          extra_upload_tag: -win32msi-x64-complete
-      - func: package_artifact
+      - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          package_variant: win32msi-x64
-          executable_os_id: win32
-      - func: put_artifact_url
-        vars:
-          package_variant: win32msi-x64
-          signature_tag: unsigned
-  - name: sign_artifact_win32msi_x64
+          dockerfile: debian10-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_debian11_deb
+    tags: ["smoke-test"]
     depends_on:
-      - name: package_artifact_win32msi_x64
+      - name: sign_artifact_deb_arm64
         variant: "*"
     commands:
       - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
       - func: get_artifact_url
         vars:
-          package_variant: win32msi-x64
-          signature_tag: unsigned
-      - func: sign_artifact
+          package_variant: deb-arm64
+          signature_tag: signed
+      - func: write_preload_script
+      - func: install
         vars:
           node_js_version: "20.18.1"
-          package_variant: win32msi-x64
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-dev"
-      - func: put_artifact_url
-        vars:
-          package_variant: win32msi-x64
-          signature_tag: signed
-  - name: verify_artifact_win32msi_x64
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_win32msi_x64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
+      - func: test_artifact_docker
         vars:
-          package_variant: win32msi-x64
-          signature_tag: signed
-      - func: verify_artifact
-
-  ###
-  # SMOKE TESTS
-  ###
-  - name: pkg_test_macos_darwin_x64
+          node_js_version: "20.18.1"
+          dockerfile: debian11-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_deb_arm64_debian12_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_darwin_x64
+      - name: sign_artifact_deb_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: darwin-x64
+          package_variant: deb-arm64
           signature_tag: signed
       - func: write_preload_script
-      - func: test_artifact_macos
-  - name: pkg_test_macos_darwin_arm64
+      - func: install
+        vars:
+          node_js_version: "20.18.1"
+      - func: test_artifact_docker
+        vars:
+          node_js_version: "20.18.1"
+          dockerfile: debian12-deb
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_arm64_rocky8_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_darwin_arm64
+      - name: sign_artifact_rpm_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: darwin-arm64
+          package_variant: rpm-arm64
           signature_tag: signed
       - func: write_preload_script
-      - func: test_artifact_macos
-  - name: pkg_test_docker_linux_x64_ubuntu20_04_tgz
+      - func: install
+        vars:
+          node_js_version: "20.18.1"
+      - func: test_artifact_docker
+        vars:
+          node_js_version: "20.18.1"
+          dockerfile: rocky8-rpm
+          task_name: ${task_name}
+  - name: pkg_test_docker_rpm_arm64_rocky9_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_linux_x64
+      - name: sign_artifact_rpm_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: linux-x64
+          package_variant: rpm-arm64
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -8947,18 +8720,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: ubuntu20.04-tgz
+          dockerfile: rocky9-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_ubuntu18_04_deb
+  - name: pkg_test_docker_rpm_arm64_fedora34_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_rpm_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: rpm-arm64
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -8967,18 +8740,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: ubuntu18.04-deb
+          dockerfile: fedora34-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_ubuntu20_04_deb
+  - name: pkg_test_docker_rpm_arm64_amazonlinux2_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_rpm_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: rpm-arm64
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -8987,18 +8760,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: ubuntu20.04-deb
+          dockerfile: amazonlinux2-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_ubuntu22_04_deb
+  - name: pkg_test_docker_rpm_arm64_amazonlinux2023_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_rpm_arm64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: rpm-arm64
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9007,18 +8780,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-deb
+          dockerfile: amazonlinux2023-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_ubuntu22_04_nohome_deb
+  - name: pkg_test_docker_deb_arm64_openssl11_ubuntu20_04_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_deb_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl11
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9027,18 +8800,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-nohome-deb
+          dockerfile: ubuntu20.04-deb
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_ubuntu22_04_qemu_deb
+  - name: pkg_test_docker_deb_arm64_openssl11_debian10_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_deb_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl11
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9047,18 +8820,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-qemu-deb
+          dockerfile: debian10-deb
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_ubuntu24_04_deb
+  - name: pkg_test_docker_deb_arm64_openssl11_debian11_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_deb_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: deb-arm64-openssl11
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9067,18 +8840,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: ubuntu24.04-deb
+          dockerfile: debian11-deb
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_debian10_deb
+  - name: pkg_test_docker_rpm_arm64_openssl11_rocky8_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_rpm_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: rpm-arm64-openssl11
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9087,18 +8860,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: debian10-deb
+          dockerfile: rocky8-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_debian11_deb
+  - name: pkg_test_docker_rpm_arm64_openssl11_rocky9_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_rpm_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: rpm-arm64-openssl11
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9107,18 +8880,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: debian11-deb
+          dockerfile: rocky9-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_debian12_deb
+  - name: pkg_test_docker_rpm_arm64_openssl11_fedora34_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64
+      - name: sign_artifact_rpm_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64
+          package_variant: rpm-arm64-openssl11
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9127,18 +8900,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: debian12-deb
+          dockerfile: fedora34-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_centos7_rpm
+  - name: pkg_test_docker_rpm_arm64_openssl11_amazonlinux2_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_rpm_arm64_openssl11
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl11
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9147,18 +8920,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: centos7-rpm
+          dockerfile: amazonlinux2-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_amazonlinux2_rpm
+  - name: pkg_test_docker_deb_arm64_openssl3_ubuntu22_04_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_deb_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: deb-arm64-openssl3
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9167,18 +8940,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: amazonlinux2-rpm
+          dockerfile: ubuntu22.04-deb
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_amazonlinux2023_rpm
+  - name: pkg_test_docker_deb_arm64_openssl3_ubuntu22_04_fips_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_deb_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: deb-arm64-openssl3
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9187,18 +8960,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: amazonlinux2023-rpm
+          dockerfile: ubuntu22.04-fips-deb
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_rocky8_rpm
+  - name: pkg_test_docker_deb_arm64_openssl3_debian12_deb
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_deb_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: deb-arm64-openssl3
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9207,18 +8980,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: rocky8-rpm
+          dockerfile: debian12-deb
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_rocky9_rpm
+  - name: pkg_test_docker_rpm_arm64_openssl3_rocky8_epel_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_rpm_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9227,18 +9000,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: rocky9-rpm
+          dockerfile: rocky8-epel-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_fedora34_rpm
+  - name: pkg_test_docker_rpm_arm64_openssl3_rocky9_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_rpm_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9247,18 +9020,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: fedora34-rpm
+          dockerfile: rocky9-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_suse12_rpm
+  - name: pkg_test_docker_rpm_arm64_openssl3_rocky9_fips_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_rpm_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9267,18 +9040,18 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: suse12-rpm
+          dockerfile: rocky9-fips-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_suse15_rpm
+  - name: pkg_test_docker_rpm_arm64_openssl3_amazonlinux2023_rpm
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_rpm_arm64_openssl3
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-arm64-openssl3
           signature_tag: signed
       - func: write_preload_script
       - func: install
@@ -9287,1052 +9060,152 @@ tasks:
       - func: test_artifact_docker
         vars:
           node_js_version: "20.18.1"
-          dockerfile: suse15-rpm
+          dockerfile: amazonlinux2023-rpm
           task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_oraclelinux9_rpm
+  - name: pkg_test_rpmextract_rpm_ppc64le
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64
+      - name: sign_artifact_rpm_ppc64le
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: rpm-x64
+          package_variant: rpm-ppc64le
           signature_tag: signed
       - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: oraclelinux9-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_openssl11_ubuntu20_04_deb
+      - func: test_artifact_rpmextract
+  - name: pkg_test_rpmextract_rpm_s390x
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64_openssl11
+      - name: sign_artifact_rpm_s390x
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64-openssl11
+          package_variant: rpm-s390x
           signature_tag: signed
       - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu20.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_openssl11_debian10_deb
+      - func: test_artifact_rpmextract
+  - name: pkg_test_ssh_win32_x64
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64_openssl11
+      - name: sign_artifact_win32_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64-openssl11
+          package_variant: win32-x64
           signature_tag: signed
       - func: write_preload_script
-      - func: install
+      - func: spawn_host
         vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
+          distro: windows-vsCurrent-small
+      - func: run_pkg_tests_through_ssh
         vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian10-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_openssl11_debian11_deb
+          admin_user_name: Administrator
+          onhost_script_path: .evergreen/test-package-win32.sh
+          preload_script_path: preload.sh
+  - name: pkg_test_ssh_win32msi_x64
     tags: ["smoke-test"]
     depends_on:
-      - name: sign_artifact_deb_x64_openssl11
+      - name: sign_artifact_win32msi_x64
         variant: "*"
     commands:
       - func: checkout
       - func: get_artifact_url
         vars:
-          package_variant: deb-x64-openssl11
+          package_variant: win32msi-x64
           signature_tag: signed
       - func: write_preload_script
-      - func: install
+      - func: spawn_host
         vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
+          distro: windows-vsCurrent-small
+      - func: run_pkg_tests_through_ssh
         vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian11-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl11_centos7_epel_rpm
-    tags: ["smoke-test"]
+          admin_user_name: Administrator
+          onhost_script_path: .evergreen/test-package-win32.sh
+          preload_script_path: preload.sh
+  - name: create_static_analysis_report
+    tags: ["extra-integration-test"]
     depends_on:
-      - name: sign_artifact_rpm_x64_openssl11
+      - name: ".compile-artifact"
         variant: "*"
     commands:
       - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: test_artifact_docker
+      - func: create_static_analysis_report
         vars:
           node_js_version: "20.18.1"
-          dockerfile: centos7-epel-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl11_amazonlinux2_rpm
-    tags: ["smoke-test"]
+
+  ###
+  # RELEASE TASKS
+  ###
+  - name: release_draft
+    git_tag_only: true
     depends_on:
-      - name: sign_artifact_rpm_x64_openssl11
+      - name: ".smoke-test"
+        variant: "*"
+      - name: ".extra-integration-test"
+        variant: "*"
+      - name: ".e2e-test"
+        variant: "*"
+      - name: ".connectivity-test"
+        variant: "*"
+      - name: check
+        variant: "*"
+      - name: ".unit-test"
         variant: "*"
     commands:
       - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: test_artifact_docker
+      - func: release_draft
         vars:
           node_js_version: "20.18.1"
-          dockerfile: amazonlinux2-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl11_rocky8_rpm
-    tags: ["smoke-test"]
+  - name: release_publish_dry_run
+    git_tag_only: true
+    exec_timeout_secs: 86400
     depends_on:
-      - name: sign_artifact_rpm_x64_openssl11
-        variant: "*"
+      - name: release_draft
     commands:
       - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: test_artifact_docker
+      - func: release_publish_download_and_list_artifacts
         vars:
           node_js_version: "20.18.1"
-          dockerfile: rocky8-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl11_rocky9_rpm
-    tags: ["smoke-test"]
+      - func: papertrail_trace
+        vars:
+          product: "mongosh-draft"
+      - func: release_publish_dry_run
+        vars:
+          node_js_version: "20.18.1"
+  - name: release_publish
+    tags: ["publish"]
+    git_tag_only: true
+    exec_timeout_secs: 86400
     depends_on:
-      - name: sign_artifact_rpm_x64_openssl11
-        variant: "*"
+      - name: compile_ts
+        variant: linux_compile
     commands:
       - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
       - func: install
         vars:
           node_js_version: "20.18.1"
-      - func: test_artifact_docker
+      - func: release_publish_download_and_list_artifacts
         vars:
           node_js_version: "20.18.1"
-          dockerfile: rocky9-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl11_fedora34_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_x64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: fedora34-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_openssl3_ubuntu22_04_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_x64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-x64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_openssl3_ubuntu22_04_fips_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_x64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-x64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-fips-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_x64_openssl3_debian12_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_x64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-x64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian12-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl3_rocky8_epel_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_x64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky8-epel-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl3_rocky9_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_x64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky9-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl3_rocky9_fips_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_x64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky9-fips-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_x64_openssl3_amazonlinux2023_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_x64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-x64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: amazonlinux2023-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_linux_arm64_ubuntu20_04_tgz
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_linux_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: linux-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu20.04-tgz
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_ubuntu18_04_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu18.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_ubuntu20_04_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu20.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_ubuntu22_04_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
+      - func: papertrail_trace
         vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_ubuntu22_04_nohome_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-nohome-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_ubuntu22_04_qemu_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-qemu-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_ubuntu24_04_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu24.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_debian10_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian10-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_debian11_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian11-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_debian12_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian12-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_rocky8_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky8-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_rocky9_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky9-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_fedora34_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: fedora34-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_amazonlinux2_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: amazonlinux2-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_amazonlinux2023_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: amazonlinux2023-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_openssl11_ubuntu20_04_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu20.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_openssl11_debian10_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian10-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_openssl11_debian11_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian11-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl11_rocky8_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky8-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl11_rocky9_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky9-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl11_fedora34_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: fedora34-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl11_amazonlinux2_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl11
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl11
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: amazonlinux2-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_openssl3_ubuntu22_04_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_openssl3_ubuntu22_04_fips_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: ubuntu22.04-fips-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_deb_arm64_openssl3_debian12_deb
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_deb_arm64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: deb-arm64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: debian12-deb
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl3_rocky8_epel_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky8-epel-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl3_rocky9_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky9-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl3_rocky9_fips_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: rocky9-fips-rpm
-          task_name: ${task_name}
-  - name: pkg_test_docker_rpm_arm64_openssl3_amazonlinux2023_rpm
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_arm64_openssl3
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-arm64-openssl3
-          signature_tag: signed
-      - func: write_preload_script
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: test_artifact_docker
-        vars:
-          node_js_version: "20.18.1"
-          dockerfile: amazonlinux2023-rpm
-          task_name: ${task_name}
-  - name: pkg_test_rpmextract_rpm_ppc64le
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_ppc64le
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-ppc64le
-          signature_tag: signed
-      - func: write_preload_script
-      - func: test_artifact_rpmextract
-  - name: pkg_test_rpmextract_rpm_s390x
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_rpm_s390x
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: rpm-s390x
-          signature_tag: signed
-      - func: write_preload_script
-      - func: test_artifact_rpmextract
-  - name: pkg_test_ssh_win32_x64
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_win32_x64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: win32-x64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: spawn_host
-        vars:
-          distro: windows-vsCurrent-small
-      - func: run_pkg_tests_through_ssh
-        vars:
-          admin_user_name: Administrator
-          onhost_script_path: .evergreen/test-package-win32.sh
-          preload_script_path: preload.sh
-  - name: pkg_test_ssh_win32msi_x64
-    tags: ["smoke-test"]
-    depends_on:
-      - name: sign_artifact_win32msi_x64
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: get_artifact_url
-        vars:
-          package_variant: win32msi-x64
-          signature_tag: signed
-      - func: write_preload_script
-      - func: spawn_host
-        vars:
-          distro: windows-vsCurrent-small
-      - func: run_pkg_tests_through_ssh
-        vars:
-          admin_user_name: Administrator
-          onhost_script_path: .evergreen/test-package-win32.sh
-          preload_script_path: preload.sh
-  - name: create_static_analysis_report
-    tags: ["extra-integration-test"]
-    depends_on:
-      - name: ".compile-artifact"
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: create_static_analysis_report
-        vars:
-          node_js_version: "20.18.1"
-
-  ###
-  # RELEASE TASKS
-  ###
-  - name: release_draft
-    git_tag_only: true
-    depends_on:
-      - name: ".smoke-test"
-        variant: "*"
-      - name: ".extra-integration-test"
-        variant: "*"
-      - name: ".e2e-test"
-        variant: "*"
-      - name: ".connectivity-test"
-        variant: "*"
-      - name: check
-        variant: "*"
-      - name: ".unit-test"
-        variant: "*"
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: release_draft
-        vars:
-          node_js_version: "20.18.1"
-  - name: release_publish_dry_run
-    git_tag_only: true
-    exec_timeout_secs: 86400
-    depends_on:
-      - name: release_draft
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: release_publish_download_and_list_artifacts
-        vars:
-          node_js_version: "20.18.1"
-      - func: papertrail_trace
-        vars:
-          product: "mongosh-draft"
-      - func: release_publish_dry_run
-        vars:
-          node_js_version: "20.18.1"
-  - name: release_publish
-    tags: ["publish"]
-    git_tag_only: true
-    exec_timeout_secs: 86400
-    depends_on:
-      - name: compile_ts
-        variant: linux_compile
-    commands:
-      - func: checkout
-      - func: install
-        vars:
-          node_js_version: "20.18.1"
-      - func: release_publish_download_and_list_artifacts
-        vars:
-          node_js_version: "20.18.1"
-      - func: papertrail_trace
-        vars:
-          product: "mongosh"
-      - func: release_publish
+          product: "mongosh"
+      - func: release_publish
         vars:
           node_js_version: "20.18.1"
 
@@ -10341,17 +9214,496 @@ buildvariants:
   - name: darwin-n20
     display_name: "MacOS 14 arm64 n20 (Unit tests)"
     run_on: macos-14-arm64
-    tags: []
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: ""
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-m60xc_n20
+    display_name: "MacOS 14 arm64 m60xc n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "6.0.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-m60xe_n20
+    display_name: "MacOS 14 arm64 m60xe n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "6.0.x-enterprise"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-m70xc_n20
+    display_name: "MacOS 14 arm64 m70xc n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "7.0.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-m70xe_n20
+    display_name: "MacOS 14 arm64 m70xe n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "7.0.x-enterprise"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-m80xc_n20
+    display_name: "MacOS 14 arm64 m80xc n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "8.0.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-m80xe_n20
+    display_name: "MacOS 14 arm64 m80xe n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "8.0.x-enterprise"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-mlatest_n20
+    display_name: "MacOS 14 arm64 mlatest n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: ["mlatest"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "latest-alpha-enterprise"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: linux-n20
+    display_name: "Ubuntu 20.04 x64 n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: ""
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m42xc_n20
+    display_name: "Ubuntu 20.04 x64 m42xc n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "4.2.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m44xc_n20
+    display_name: "Ubuntu 20.04 x64 m44xc n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "4.4.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m44xe_n20
+    display_name: "Ubuntu 20.04 x64 m44xe n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "4.4.x-enterprise"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m50xc_n20
+    display_name: "Ubuntu 20.04 x64 m50xc n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "5.0.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m50xe_n20
+    display_name: "Ubuntu 20.04 x64 m50xe n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "5.0.x-enterprise"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m60xc_n20
+    display_name: "Ubuntu 20.04 x64 m60xc n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "6.0.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m60xe_n20
+    display_name: "Ubuntu 20.04 x64 m60xe n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: ""
+      mongosh_server_test_version: "6.0.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10361,6 +9713,7 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
+      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10370,20 +9723,19 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m60xc_n20
-    display_name: "MacOS 14 arm64 m60xc n20 (Unit tests)"
-    run_on: macos-14-arm64
-    tags: []
+  - name: tests_linux-m70xc_n20
+    display_name: "Ubuntu 20.04 x64 m70xc n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "6.0.x"
+      mongosh_server_test_version: "7.0.x"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10393,6 +9745,7 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
+      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10402,20 +9755,19 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m60xe_n20
-    display_name: "MacOS 14 arm64 m60xe n20 (Unit tests)"
-    run_on: macos-14-arm64
-    tags: []
+  - name: tests_linux-m70xe_n20
+    display_name: "Ubuntu 20.04 x64 m70xe n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "6.0.x-enterprise"
+      mongosh_server_test_version: "7.0.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10425,6 +9777,7 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
+      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10434,20 +9787,19 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m70xc_n20
-    display_name: "MacOS 14 arm64 m70xc n20 (Unit tests)"
-    run_on: macos-14-arm64
-    tags: []
+  - name: tests_linux-m80xc_n20
+    display_name: "Ubuntu 20.04 x64 m80xc n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "7.0.x"
+      mongosh_server_test_version: "8.0.x"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10457,6 +9809,7 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
+      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10466,20 +9819,19 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m70xe_n20
-    display_name: "MacOS 14 arm64 m70xe n20 (Unit tests)"
-    run_on: macos-14-arm64
-    tags: []
+  - name: tests_linux-m80xe_n20
+    display_name: "Ubuntu 20.04 x64 m80xe n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_server_test_version: "8.0.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10489,6 +9841,7 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
+      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10498,20 +9851,19 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m80xc_n20
-    display_name: "MacOS 14 arm64 m80xc n20 (Unit tests)"
-    run_on: macos-14-arm64
-    tags: []
+  - name: tests_linux-mlatest_n20
+    display_name: "Ubuntu 20.04 x64 mlatest n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver","mlatest"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.0.x"
+      mongosh_server_test_version: "latest-alpha-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10521,6 +9873,7 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
+      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10530,20 +9883,19 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m80xe_n20
-    display_name: "MacOS 14 arm64 m80xe n20 (Unit tests)"
-    run_on: macos-14-arm64
+  - name: win32-n20
+    display_name: "Windows n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
     tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.0.x-enterprise"
+      executable_os_id: win32
+      mongosh_server_test_version: ""
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10562,20 +9914,19 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-mlatest_n20
-    display_name: "MacOS 14 arm64 mlatest n20 (Unit tests)"
-    run_on: macos-14-arm64
-    tags: ["mlatest"]
+  - name: tests_win32-m42xc_n20
+    display_name: "Windows m42xc n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "latest-alpha-enterprise"
+      executable_os_id: win32
+      mongosh_server_test_version: "4.2.x"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
       - name: test_arg_parser
       - name: test_async_rewriter2
       - name: test_autocomplete
-      - name: test_browser_repl
       - name: test_browser_runtime_core
       - name: test_browser_runtime_electron
       - name: test_build
@@ -10594,13 +9945,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: linux-n20
-    display_name: "Ubuntu 20.04 x64 n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m42xe_n20
+    display_name: "Windows m42xe n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: ""
+      executable_os_id: win32
+      mongosh_server_test_version: "4.2.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10616,7 +9967,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10626,13 +9976,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m42xc_n20
-    display_name: "Ubuntu 20.04 x64 m42xc n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m44xc_n20
+    display_name: "Windows m44xc n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "4.2.x"
+      executable_os_id: win32
+      mongosh_server_test_version: "4.4.x"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10648,7 +9998,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10658,13 +10007,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m44xc_n20
-    display_name: "Ubuntu 20.04 x64 m44xc n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m44xe_n20
+    display_name: "Windows m44xe n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "4.4.x"
+      executable_os_id: win32
+      mongosh_server_test_version: "4.4.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10680,7 +10029,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10690,13 +10038,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m44xe_n20
-    display_name: "Ubuntu 20.04 x64 m44xe n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m50xc_n20
+    display_name: "Windows m50xc n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "4.4.x-enterprise"
+      executable_os_id: win32
+      mongosh_server_test_version: "5.0.x"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10712,7 +10060,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10722,13 +10069,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m50xc_n20
-    display_name: "Ubuntu 20.04 x64 m50xc n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m50xe_n20
+    display_name: "Windows m50xe n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "5.0.x"
+      executable_os_id: win32
+      mongosh_server_test_version: "5.0.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10744,7 +10091,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10754,13 +10100,106 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m50xe_n20
-    display_name: "Ubuntu 20.04 x64 m50xe n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m60xc_n20
+    display_name: "Windows m60xc n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
+    expansions:
+      executable_os_id: win32
+      mongosh_server_test_version: "6.0.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_win32-m60xe_n20
+    display_name: "Windows m60xe n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
+    expansions:
+      executable_os_id: win32
+      mongosh_server_test_version: "6.0.x-enterprise"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_win32-m70xc_n20
+    display_name: "Windows m70xc n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
+    expansions:
+      executable_os_id: win32
+      mongosh_server_test_version: "7.0.x"
+      node_js_version: "20.18.1"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_win32-m70xe_n20
+    display_name: "Windows m70xe n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "5.0.x-enterprise"
+      executable_os_id: win32
+      mongosh_server_test_version: "7.0.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10776,7 +10215,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10786,13 +10224,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m60xc_n20
-    display_name: "Ubuntu 20.04 x64 m60xc n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m80xc_n20
+    display_name: "Windows m80xc n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "6.0.x"
+      executable_os_id: win32
+      mongosh_server_test_version: "8.0.x"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10808,7 +10246,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10818,13 +10255,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m60xe_n20
-    display_name: "Ubuntu 20.04 x64 m60xe n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-m80xe_n20
+    display_name: "Windows m80xe n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "6.0.x-enterprise"
+      executable_os_id: win32
+      mongosh_server_test_version: "8.0.x-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10840,7 +10277,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10850,13 +10286,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m70xc_n20
-    display_name: "Ubuntu 20.04 x64 m70xc n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
+  - name: tests_win32-mlatest_n20
+    display_name: "Windows mlatest n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: ["mlatest"]
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "7.0.x"
+      executable_os_id: win32
+      mongosh_server_test_version: "latest-alpha-enterprise"
       node_js_version: "20.18.1"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10872,7 +10308,6 @@ buildvariants:
       - name: test_errors
       - name: test_history
       - name: test_i18n
-      - name: test_java_shell
       - name: test_js_multiline_to_singleline
       - name: test_logging
       - name: test_node_runtime_worker_thread
@@ -10882,588 +10317,706 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m70xe_n20
-    display_name: "Ubuntu 20.04 x64 m70xe n20 (Unit tests)"
+  - name: build_linux_x64
+    display_name: "RHEL 7.0 x64 (Build)"
+    run_on: rhel70-build
+    expansions:
+      executable_os_id: "linux-x64"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_x64_rhel8
+    display_name: "RHEL 8.0 x64 (Build)"
+    run_on: rhel80-build
+    expansions:
+      executable_os_id: "linux-x64"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_x64_openssl11
+    display_name: "RHEL 7.0 x64 openssl11 (Build)"
+    run_on: rhel70-build
+    expansions:
+      executable_os_id: "linux-x64-openssl11"
+      node_js_version: "20.18.1"
+      mongosh_shared_openssl: "openssl11"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_x64_openssl11_rhel8
+    display_name: "RHEL 8.0 x64 openssl11 (Build)"
+    run_on: rhel80-build
+    expansions:
+      executable_os_id: "linux-x64-openssl11"
+      node_js_version: "20.18.1"
+      mongosh_shared_openssl: "openssl11"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_x64_openssl3
+    display_name: "RHEL 7.0 x64 openssl3 (Build)"
+    run_on: rhel70-build
+    expansions:
+      executable_os_id: "linux-x64-openssl3"
+      node_js_version: "20.18.1"
+      mongosh_shared_openssl: "openssl3"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_x64_openssl3_rhel8
+    display_name: "RHEL 8.0 x64 openssl3 (Build)"
+    run_on: rhel80-build
+    expansions:
+      executable_os_id: "linux-x64-openssl3"
+      node_js_version: "20.18.1"
+      mongosh_shared_openssl: "openssl3"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_arm64
+    display_name: "Amazon 2 arm64 (Build)"
+    run_on: amazon2-arm64-large
+    expansions:
+      executable_os_id: "linux-arm64"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_arm64_openssl11
+    display_name: "Amazon 2 arm64 openssl11 (Build)"
+    run_on: amazon2-arm64-large
+    expansions:
+      executable_os_id: "linux-arm64-openssl11"
+      node_js_version: "20.18.1"
+      mongosh_shared_openssl: "openssl11"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_arm64_openssl3
+    display_name: "Amazon 2 arm64 openssl3 (Build)"
+    run_on: amazon2-arm64-large
+    expansions:
+      executable_os_id: "linux-arm64-openssl3"
+      node_js_version: "20.18.1"
+      mongosh_shared_openssl: "openssl3"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_ppc64le
+    display_name: "RHEL 8 PPC (Build)"
+    run_on: rhel8-power-small
+    expansions:
+      executable_os_id: "linux-ppc64le"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: build_linux_s390x
+    display_name: "RHEL 7 s390x (Build)"
+    run_on: rhel7-zseries-large
+    expansions:
+      executable_os_id: "linux-s390x"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: build_darwin
+    display_name: "MacOS Big Sur (Build)"
+    run_on: macos-11
+    expansions:
+      executable_os_id: "darwin-x64"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: build_darwin_arm64
+    display_name: "MacOS Big Sur arm64 (Build)"
+    run_on: macos-11-arm64
+    expansions:
+      executable_os_id: "darwin-arm64"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: build_win32
+    display_name: "Windows VS 2022 (Build)"
+    run_on: windows-vsCurrent-large
+    expansions:
+      executable_os_id: "win32"
+      node_js_version: "20.18.1"
+    tasks:
+      - name: compile_artifact
+  - name: e2e_tests_rhel70_large_m70x
+    display_name: "RHEL 7.0 x64 70x (E2E tests)"
+    run_on: rhel70-large
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_rhel76_large_m70x
+    display_name: "RHEL 7.6 x64 70x (E2E tests)"
+    run_on: rhel76-large
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_rhel80_small
+    display_name: "RHEL 8.0 x64 (E2E tests)"
+    run_on: rhel80-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_rhel90_small_m70x
+    display_name: "RHEL 9.0 x64 70x (E2E tests)"
+    run_on: rhel90-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: true
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_rhel93_small
+    display_name: "RHEL 9.3 x64 (E2E tests)"
+    run_on: rhel93-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: true
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_rhel83_fips
+    display_name: "RHEL 8.3 x64 (E2E tests)"
+    run_on: rhel83-fips
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_rhel83_fips_openssl11
+    display_name: "RHEL 8.3 x64 openssl11 (E2E tests)"
+    run_on: rhel83-fips
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl11"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64_openssl11
+  - name: e2e_tests_rhel83_fips_openssl11_true
+    display_name: "RHEL 8.3 x64 openssl11 FIPS (E2E tests)"
+    run_on: rhel83-fips
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl11"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: "1"
+    tasks:
+      - name: e2e_tests_linux_x64_openssl11
+  - name: e2e_tests_rhel93_fips
+    display_name: "RHEL 9.3 x64 (E2E tests)"
+    run_on: rhel93-fips
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_rhel93_fips_openssl3
+    display_name: "RHEL 9.3 x64 openssl3 (E2E tests)"
+    run_on: rhel93-fips
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64_openssl3
+  - name: e2e_tests_rhel93_fips_openssl3_true
+    display_name: "RHEL 9.3 x64 openssl3 FIPS (E2E tests)"
+    run_on: rhel93-fips
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: "1"
+    tasks:
+      - name: e2e_tests_linux_x64_openssl3
+  - name: e2e_tests_ubuntu1804_large_m60x
+    display_name: "Ubuntu 18.04 x64 60x (E2E tests)"
+    run_on: ubuntu1804-large
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "6.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_ubuntu2004_small
+    display_name: "Ubuntu 20.04 x64 (E2E tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_ubuntu2004_small_openssl11
+    display_name: "Ubuntu 20.04 x64 openssl11 (E2E tests)"
     run_on: ubuntu2004-small
     tags: ["nightly-driver"]
     expansions:
-      executable_os_id: darwin-arm64
+      executable_os_id: "linux-x64-openssl11"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64_openssl11
+  - name: e2e_tests_ubuntu2204_small
+    display_name: "Ubuntu 22.04 x64 (E2E tests)"
+    run_on: ubuntu2204-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_ubuntu2204_small_openssl3
+    display_name: "Ubuntu 22.04 x64 openssl3 (E2E tests)"
+    run_on: ubuntu2204-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64_openssl3
+  - name: e2e_tests_ubuntu2404_small
+    display_name: "Ubuntu 24.04 x64 (E2E tests)"
+    run_on: ubuntu2404-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_ubuntu2404_small_openssl3
+    display_name: "Ubuntu 24.04 x64 openssl3 (E2E tests)"
+    run_on: ubuntu2404-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64_openssl3
+  - name: e2e_tests_debian10_small_m60x
+    display_name: "Debian 10 x64 60x (E2E tests)"
+    run_on: debian10-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "6.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_debian10_small_openssl11_m60x
+    display_name: "Debian 10 x64 60x openssl11 (E2E tests)"
+    run_on: debian10-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl11"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "6.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64_openssl11
+  - name: e2e_tests_debian11_small_m70x
+    display_name: "Debian 11 x64 70x (E2E tests)"
+    run_on: debian11-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_debian11_small_openssl11_m70x
+    display_name: "Debian 11 x64 70x openssl11 (E2E tests)"
+    run_on: debian11-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64-openssl11"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64_openssl11
+  - name: e2e_tests_amazon2_large_m70x
+    display_name: "Amazon Linux 2 x64 70x (E2E tests)"
+    run_on: amazon2-large
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
       mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_amazon2023.0_small
+    display_name: "Amazon Linux 2023 x64 (E2E tests)"
+    run_on: amazon2023.0-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: true
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_java_shell
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_linux-m80xc_n20
-    display_name: "Ubuntu 20.04 x64 m80xc n20 (Unit tests)"
-    run_on: ubuntu2004-small
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_suse12_sp5_large_m70x
+    display_name: "SLES 12 x64 70x (E2E tests)"
+    run_on: suse12-sp5-large
     tags: ["nightly-driver"]
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.0.x"
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_java_shell
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_linux-m80xe_n20
-    display_name: "Ubuntu 20.04 x64 m80xe n20 (Unit tests)"
-    run_on: ubuntu2004-small
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_suse15sp4_small
+    display_name: "SLES 15 x64 (E2E tests)"
+    run_on: suse15sp4-small
     tags: ["nightly-driver"]
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.0.x-enterprise"
+      executable_os_id: "linux-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_java_shell
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_linux-mlatest_n20
-    display_name: "Ubuntu 20.04 x64 mlatest n20 (Unit tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver","mlatest"]
+      - name: e2e_tests_linux_x64
+  - name: e2e_tests_ubuntu1804_arm64_large_m60x
+    display_name: "Ubuntu 18.04 arm64 60x (E2E tests)"
+    run_on: ubuntu1804-arm64-large
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
-      mongosh_server_test_version: "latest-alpha-enterprise"
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "6.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_java_shell
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: win32-n20
-    display_name: "Windows n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_ubuntu2004_arm64_small
+    display_name: "Ubuntu 20.04 arm64 (E2E tests)"
+    run_on: ubuntu2004-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: ""
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m42xc_n20
-    display_name: "Windows m42xc n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_ubuntu2004_arm64_small_openssl11
+    display_name: "Ubuntu 20.04 arm64 openssl11 (E2E tests)"
+    run_on: ubuntu2004-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "4.2.x"
+      executable_os_id: "linux-arm64-openssl11"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m42xe_n20
-    display_name: "Windows m42xe n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64_openssl11
+  - name: e2e_tests_ubuntu2204_arm64_small
+    display_name: "Ubuntu 22.04 arm64 (E2E tests)"
+    run_on: ubuntu2204-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "4.2.x-enterprise"
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m44xc_n20
-    display_name: "Windows m44xc n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_ubuntu2204_arm64_small_openssl3
+    display_name: "Ubuntu 22.04 arm64 openssl3 (E2E tests)"
+    run_on: ubuntu2204-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "4.4.x"
+      executable_os_id: "linux-arm64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m44xe_n20
-    display_name: "Windows m44xe n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64_openssl3
+  - name: e2e_tests_ubuntu2404_arm64_small
+    display_name: "Ubuntu 24.04 arm64 (E2E tests)"
+    run_on: ubuntu2404-arm64-small
+    tags: []
+    expansions:
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_ubuntu2404_arm64_small_openssl3
+    display_name: "Ubuntu 24.04 arm64 openssl3 (E2E tests)"
+    run_on: ubuntu2404-arm64-small
+    tags: []
+    expansions:
+      executable_os_id: "linux-arm64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_arm64_openssl3
+  - name: e2e_tests_amazon2_arm64_large_m70x
+    display_name: "Amazon Linux 2 arm64 70x (E2E tests)"
+    run_on: amazon2-arm64-large
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "4.4.x-enterprise"
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m50xc_n20
-    display_name: "Windows m50xc n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_amazon2023.0_arm64_small
+    display_name: "Amazon Linux 2023 arm64 (E2E tests)"
+    run_on: amazon2023.0-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "5.0.x"
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: true
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m50xe_n20
-    display_name: "Windows m50xe n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_rhel82_arm64_small
+    display_name: "RHEL 8.2 arm64 (E2E tests)"
+    run_on: rhel82-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "5.0.x-enterprise"
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m60xc_n20
-    display_name: "Windows m60xc n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_rhel90_arm64_small_m70x
+    display_name: "RHEL 9.0 arm64 70x (E2E tests)"
+    run_on: rhel90-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "6.0.x"
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: true
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m60xe_n20
-    display_name: "Windows m60xe n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_rhel90_arm64_small_openssl3_m70x
+    display_name: "RHEL 9.0 arm64 70x openssl3 (E2E tests)"
+    run_on: rhel90-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "6.0.x-enterprise"
+      executable_os_id: "linux-arm64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: true
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "7.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m70xc_n20
-    display_name: "Windows m70xc n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64_openssl3
+  - name: e2e_tests_rhel93_arm64_small
+    display_name: "RHEL 9.3 arm64 (E2E tests)"
+    run_on: rhel93-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "7.0.x"
+      executable_os_id: "linux-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: true
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m70xe_n20
-    display_name: "Windows m70xe n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64
+  - name: e2e_tests_rhel93_arm64_small_openssl3
+    display_name: "RHEL 9.3 arm64 openssl3 (E2E tests)"
+    run_on: rhel93-arm64-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "7.0.x-enterprise"
+      executable_os_id: "linux-arm64-openssl3"
+      disable_openssl_shared_config_for_bundled_openssl: true
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m80xc_n20
-    display_name: "Windows m80xc n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_arm64_openssl3
+  - name: e2e_tests_rhel8_power_small
+    display_name: "RHEL 8 PPC (E2E tests)"
+    run_on: rhel8-power-small
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "8.0.x"
+      executable_os_id: "linux-ppc64le"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-m80xe_n20
-    display_name: "Windows m80xe n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
+      - name: e2e_tests_linux_ppc64le
+  - name: e2e_tests_rhel7_zseries_large_m60x
+    display_name: "RHEL 7 s390x 60x (E2E tests)"
+    run_on: rhel7-zseries-large
+    tags: []
+    expansions:
+      executable_os_id: "linux-s390x"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "6.0.x-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_s390x
+  - name: e2e_tests_rhel8_zseries_small
+    display_name: "RHEL 8 s390x (E2E tests)"
+    run_on: rhel8-zseries-small
+    tags: []
+    expansions:
+      executable_os_id: "linux-s390x"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_s390x
+  - name: e2e_tests_macos_14
+    display_name: "MacOS 14 x64 (E2E tests)"
+    run_on: macos-14
     tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "8.0.x-enterprise"
+      executable_os_id: "darwin-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: tests_win32-mlatest_n20
-    display_name: "Windows mlatest n20 (Unit tests)"
-    run_on: windows-vsCurrent-small
-    tags: ["mlatest"]
+      - name: e2e_tests_darwin
+  - name: e2e_tests_macos_14_arm64
+    display_name: "MacOS 14 arm64 (E2E tests)"
+    run_on: macos-14-arm64
+    tags: []
     expansions:
-      executable_os_id: win32
-      mongosh_server_test_version: "latest-alpha-enterprise"
+      executable_os_id: "darwin-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
-      mongosh_skip_node_version_check: ""
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: test_arg_parser
-      - name: test_async_rewriter2
-      - name: test_autocomplete
-      - name: test_browser_runtime_core
-      - name: test_browser_runtime_electron
-      - name: test_build
-      - name: test_cli_repl
-      - name: test_e2e_tests
-      - name: test_editor
-      - name: test_errors
-      - name: test_history
-      - name: test_i18n
-      - name: test_js_multiline_to_singleline
-      - name: test_logging
-      - name: test_node_runtime_worker_thread
-      - name: test_service_provider_core
-      - name: test_service_provider_node_driver
-      - name: test_shell_api
-      - name: test_shell_evaluator
-      - name: test_snippet_manager
-      - name: test_types
-  - name: darwin
-    display_name: "MacOS Big Sur"
+      - name: e2e_tests_darwin_arm64
+  - name: e2e_tests_darwin
+    display_name: "MacOS Big Sur (E2E tests)"
     run_on: macos-11
+    tags: []
     expansions:
-      executable_os_id: darwin-x64
+      executable_os_id: "darwin-x64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: compile_artifact
-      - name: e2e_tests_darwin_x64
-  - name: darwin_arm64
-    display_name: "MacOS Big Sur (arm64)"
+      - name: e2e_tests_darwin
+  - name: e2e_tests_darwin_arm64
+    display_name: "MacOS Big Sur arm64 (E2E tests)"
     run_on: macos-11-arm64
+    tags: []
     expansions:
-      executable_os_id: darwin-arm64
+      executable_os_id: "darwin-arm64"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
     tasks:
-      - name: compile_artifact
       - name: e2e_tests_darwin_arm64
       - name: package_artifact_darwin_x64
       - name: sign_artifact_darwin_x64
       - name: package_artifact_darwin_arm64
       - name: sign_artifact_darwin_arm64
+  - name: e2e_tests_windows_vsCurrent_small
+    display_name: "Windows VS 2022 (E2E tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
+    expansions:
+      executable_os_id: "win32"
+      disable_openssl_shared_config_for_bundled_openssl: false
+      node_js_version: "20.18.1"
+      mongosh_server_test_version: "stable-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_win32
+      - name: package_artifact_win32_x64
+      - name: package_artifact_win32msi_x64
 
   - name: linux_compile
     display_name: "Ubuntu 20.04 x64 (Compile and Check)"
@@ -11593,314 +11146,6 @@ buildvariants:
     tasks:
       - name: verify_artifact_darwin_arm64
       - name: verify_artifact_darwin_x64
-  - name: linux_x64_build
-    display_name: "RHEL 7.0 x64 (build)"
-    run_on: rhel70-build
-    expansions:
-      executable_os_id: linux-x64
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_rhel8
-    display_name: "RHEL 8.0 x64 (build)"
-    run_on: rhel80-build
-    expansions:
-      executable_os_id: linux-x64
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl11
-    display_name: "RHEL 7.0 x64 (build, shared OpenSSL 1.1)"
-    run_on: rhel70-build
-    expansions:
-      executable_os_id: linux-x64-openssl11
-      mongosh_shared_openssl: openssl11
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl11_rhel8
-    display_name: "RHEL 8.0 x64 (build, shared OpenSSL 1.1)"
-    run_on: rhel80-build
-    expansions:
-      executable_os_id: linux-x64-openssl11
-      mongosh_shared_openssl: openssl11
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl3
-    display_name: "RHEL 7.0 x64 (build, shared OpenSSL 3)"
-    run_on: rhel70-build
-    expansions:
-      executable_os_id: linux-x64-openssl3
-      mongosh_shared_openssl: openssl3
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl3_rhel8
-    display_name: "RHEL 8.0 x64 (build, shared OpenSSL 3)"
-    run_on: rhel80-build
-    expansions:
-      executable_os_id: linux-x64-openssl3
-      mongosh_shared_openssl: openssl3
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_arm64_build
-    display_name: "Amazon 2 arm64 (build)"
-    run_on: amazon2-arm64-large
-    expansions:
-      executable_os_id: linux-arm64
-    tasks:
-      - name: compile_artifact
-  - name: linux_arm64_build_openssl11
-    display_name: "Amazon 2 arm64 (build, shared OpenSSL 1.1)"
-    run_on: amazon2-arm64-large
-    expansions:
-      executable_os_id: linux-arm64-openssl11
-      mongosh_shared_openssl: openssl11
-    tasks:
-      - name: compile_artifact
-  - name: linux_arm64_build_openssl3
-    display_name: "Amazon 2 arm64 (build, shared OpenSSL 3)"
-    run_on: amazon2-arm64-large
-    expansions:
-      executable_os_id: linux-arm64-openssl3
-      mongosh_shared_openssl: openssl3
-    tasks:
-      - name: compile_artifact
-  - name: linux_ppc64le_build
-    display_name: "RHEL 8 PPC (build)"
-    run_on: rhel8-power-small
-    expansions:
-      executable_os_id: linux-ppc64le
-    tasks:
-      - name: compile_artifact
-  - name: linux_s390x_build
-    display_name: "RHEL 7 s390x (build)"
-    run_on: rhel7-zseries-large
-    expansions:
-      executable_os_id: linux-s390x
-    tasks:
-      - name: compile_artifact
-
-  - name: e2e_rhel70_x64
-    display_name: "RHEL 7.0 x64 (E2E Tests)"
-    run_on: rhel70-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_rhel76_x64
-    display_name: "RHEL 7.6 x64 (E2E Tests)"
-    run_on: rhel76-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_rhel80_x64
-    display_name: "RHEL 8.0 x64 (E2E Tests)"
-    run_on: rhel80-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_rhel90_x64
-    display_name: "RHEL 9.0 x64 (E2E Tests)"
-    run_on: rhel90-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_rhel93_x64
-    display_name: "RHEL 9.3 x64 (E2E Tests)"
-    run_on: rhel93-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_rhel83_x64
-    display_name: "RHEL 8.3 x64 (E2E Tests, FIPS-available OS)"
-    run_on: rhel83-fips
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl11
-      - name: e2e_tests_linux_x64_openssl11_fips
-  - name: e2e_rhel93_fips_x64
-    display_name: "RHEL 9.3 x64 (E2E Tests, FIPS-available OS)"
-    run_on: rhel93-fips
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl3
-      - name: e2e_tests_linux_x64_openssl3_fips
-  - name: e2e_ubuntu1804_x64
-    display_name: "Ubuntu 18.04 x64 (E2E Tests)"
-    run_on: ubuntu1804-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_60x
-  - name: e2e_ubuntu2004_x64
-    display_name: "Ubuntu 20.04 x64 (E2E Tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl11
-  - name: e2e_ubuntu2204_x64
-    display_name: "Ubuntu 22.04 x64 (E2E Tests)"
-    run_on: ubuntu2204-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl3
-  - name: e2e_ubuntu2404_x64
-    display_name: "Ubuntu 24.04 x64 (E2E Tests)"
-    run_on: ubuntu2404-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl3
-  - name: e2e_debian10_x64
-    display_name: "Debian 10 x64 (E2E Tests)"
-    run_on: debian10-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_60x
-      - name: e2e_tests_linux_x64_openssl11_60x
-  - name: e2e_debian11_x64
-    display_name: "Debian 11 x64 (E2E Tests)"
-    run_on: debian11-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-      - name: e2e_tests_linux_x64_openssl11_70x
-  - name: e2e_amazon2_x64
-    display_name: "Amazon Linux 2 x64 (E2E Tests)"
-    run_on: amazon2-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_amazon2023_x64
-    display_name: "Amazon Linux 2023 x64 (E2E Tests)"
-    run_on: amazon2023.0-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_suse12_x64
-    display_name: "SLES 12 x64 (E2E Tests)"
-    run_on: suse12-sp5-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_suse15_x64
-    display_name: "SLES 15 x64 (E2E Tests)"
-    run_on: suse15sp4-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_ubuntu1804_arm64
-    display_name: "Ubuntu 18.04 arm64 (E2E Tests)"
-    run_on: ubuntu1804-arm64-large
-    tasks:
-      - name: e2e_tests_linux_arm64_60x
-  - name: e2e_ubuntu2004_arm64
-    display_name: "Ubuntu 20.04 arm64 (E2E Tests)"
-    run_on: ubuntu2004-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl11
-  - name: e2e_ubuntu2204_arm64
-    display_name: "Ubuntu 22.04 arm64 (E2E Tests)"
-    run_on: ubuntu2204-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_ubuntu2404_arm64
-    display_name: "Ubuntu 24.04 arm64 (E2E Tests)"
-    run_on: ubuntu2404-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_amazon2_arm64
-    display_name: "Amazon Linux 2 arm64 (E2E Tests)"
-    run_on: amazon2-arm64-large
-    tasks:
-      - name: e2e_tests_linux_arm64_70x
-  - name: e2e_amazon2023_arm64
-    display_name: "Amazon Linux 2023 arm64 (E2E Tests)"
-    run_on: amazon2023.0-arm64-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tasks:
-      - name: e2e_tests_linux_arm64
-  - name: e2e_rhel82_arm64
-    display_name: "RHEL 8.2 arm64 (E2E Tests)"
-    run_on: rhel82-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-  - name: e2e_rhel90_arm64
-    display_name: "RHEL 9.0 arm64 (E2E Tests)"
-    run_on: rhel90-arm64-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tasks:
-      - name: e2e_tests_linux_arm64_70x
-      - name: e2e_tests_linux_arm64_openssl3_70x
-  - name: e2e_rhel93_arm64
-    display_name: "RHEL 9.3 arm64 (E2E Tests)"
-    run_on: rhel93-arm64-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel8_ppc64le
-    display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel8-power-small
-    tasks:
-      - name: e2e_tests_linux_ppc64le
-  - name: e2e_rhel7_s390x
-    display_name: "RHEL 7 s390x (E2E Tests)"
-    run_on: rhel7-zseries-large
-    tasks:
-      - name: e2e_tests_linux_s390x_60x
-  - name: e2e_rhel8_s390x
-    display_name: "RHEL 8 s390x (E2E Tests)"
-    run_on: rhel8-zseries-small
-    tasks:
-      - name: e2e_tests_linux_s390x
-  - name: e2e_macos14_x64
-    display_name: "MacOS 14 x64 (E2E Tests)"
-    run_on: macos-14
-    expansions:
-      executable_os_id: darwin-x64
-    tasks:
-      - name: e2e_tests_darwin_x64
-  - name: e2e_macos14_arm64
-    display_name: "MacOS 14 arm64 (E2E Tests)"
-    run_on: macos-14-arm64
-    expansions:
-      executable_os_id: darwin-arm64
-    tasks:
-      - name: e2e_tests_darwin_arm64
-  - name: win32
-    display_name: "Windows VS 2022"
-    run_on: windows-vsCurrent-small
-    expansions:
-      executable_os_id: win32
-    tasks:
-      - name: e2e_tests_win32
-      - name: package_artifact_win32_x64
-      - name: package_artifact_win32msi_x64
-  - name: win32_build
-    display_name: "Windows VS 2022 (build)"
-    run_on: windows-vsCurrent-large
-    expansions:
-      executable_os_id: win32
-    tasks:
-      - name: compile_artifact
 
   - name: pkg_smoke_tests_docker_x64
     display_name: "package smoke (x64 Docker)"
@@ -12090,4 +11335,4 @@ buildvariants:
     display_name: "Performance Tests"
     run_on: rhel90-dbx-perf-large
     tasks:
-      - name: perf_tests_linux_x64
+      - name: perf_tests
diff --git a/.evergreen/build-variants/compile-build-variants.d.ts b/.evergreen/build-variants/compile-build-variants.d.ts
new file mode 100644
index 000000000..1d0c853f8
--- /dev/null
+++ b/.evergreen/build-variants/compile-build-variants.d.ts
@@ -0,0 +1,8 @@
+export type CompileBuildVariantDefinition = {
+  name: string;
+  displayName: string;
+  runOn: string;
+  executableOsId: string;
+  id?: string;
+  sharedOpenSsl?: string;
+};
diff --git a/.evergreen/build-variants/compile-build-variants.js b/.evergreen/build-variants/compile-build-variants.js
new file mode 100644
index 000000000..fbdeb991e
--- /dev/null
+++ b/.evergreen/build-variants/compile-build-variants.js
@@ -0,0 +1,98 @@
+// @ts-check
+
+/** @type {(import("./compile-build-variants").CompileBuildVariantDefinition)[]} */
+exports.COMPILE_BUILD_VARIANTS = [
+  {
+    displayName: "RHEL 7.0 x64",
+    runOn: "rhel70-build",
+    executableOsId: "linux-x64",
+  },
+  {
+    displayName: "RHEL 8.0 x64",
+    runOn: "rhel80-build",
+    id: "linux_x64_rhel8",
+    executableOsId: "linux-x64",
+  },
+  {
+    displayName: "RHEL 7.0 x64",
+    runOn: "rhel70-build",
+    executableOsId: "linux-x64-openssl11",
+    sharedOpenSsl: "openssl11",
+  },
+  {
+    displayName: "RHEL 8.0 x64",
+    runOn: "rhel80-build",
+    id: "linux_x64_openssl11_rhel8",
+    executableOsId: "linux-x64-openssl11",
+    sharedOpenSsl: "openssl11",
+  },
+  {
+    displayName: "RHEL 7.0 x64",
+    runOn: "rhel70-build",
+    executableOsId: "linux-x64-openssl3",
+    sharedOpenSsl: "openssl3",
+  },
+  {
+    displayName: "RHEL 8.0 x64",
+    runOn: "rhel80-build",
+    id: "linux_x64_openssl3_rhel8",
+    executableOsId: "linux-x64-openssl3",
+    sharedOpenSsl: "openssl3",
+  },
+  {
+    displayName: "Amazon 2 arm64",
+    runOn: "amazon2-arm64-large",
+    executableOsId: "linux-arm64",
+  },
+  {
+    displayName: "Amazon 2 arm64",
+    runOn: "amazon2-arm64-large",
+    executableOsId: "linux-arm64-openssl11",
+    sharedOpenSsl: "openssl11",
+  },
+  {
+    displayName: "Amazon 2 arm64",
+    runOn: "amazon2-arm64-large",
+    executableOsId: "linux-arm64-openssl3",
+    sharedOpenSsl: "openssl3",
+  },
+  {
+    displayName: "RHEL 8 PPC",
+    runOn: "rhel8-power-small",
+    executableOsId: "linux-ppc64le",
+  },
+  {
+    displayName: "RHEL 7 s390x",
+    runOn: "rhel7-zseries-large",
+    executableOsId: "linux-s390x",
+  },
+  {
+    displayName: "MacOS Big Sur",
+    id: "darwin",
+    runOn: "macos-11",
+    executableOsId: "darwin-x64",
+  },
+  {
+    displayName: "MacOS Big Sur arm64",
+    runOn: "macos-11-arm64",
+    executableOsId: "darwin-arm64",
+  },
+  {
+    id: "win32",
+    displayName: "Windows VS 2022",
+    runOn: "windows-vsCurrent-large",
+    executableOsId: "win32",
+  },
+].map((buildVariant) => {
+  const { displayName, sharedOpenSsl, id, executableOsId } = buildVariant;
+  const formattedDisplayName = [displayName, sharedOpenSsl, "(Build)"]
+    .filter((text) => text)
+    .join(" ");
+
+  return {
+    ...buildVariant,
+    id,
+    displayName: formattedDisplayName,
+    name: `build_${id ?? executableOsId.replaceAll("-", "_")}`,
+  };
+});
diff --git a/.evergreen/build-variants/e2e-tests-build-variants.d.ts b/.evergreen/build-variants/e2e-tests-build-variants.d.ts
new file mode 100644
index 000000000..8a877de57
--- /dev/null
+++ b/.evergreen/build-variants/e2e-tests-build-variants.d.ts
@@ -0,0 +1,12 @@
+export type E2ETestsBuildVariantDefinition = {
+  displayName: string;
+  name: string;
+  compileBuildVariant: string;
+  runOn: string;
+  executableOsId: string;
+  mVersion: string;
+  tags?: string[];
+  disableOpenSslSharedConfig?: boolean;
+  fips?: boolean;
+  additionalTasks?: string[];
+};
diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js
new file mode 100644
index 000000000..c44d090da
--- /dev/null
+++ b/.evergreen/build-variants/e2e-tests-build-variants.js
@@ -0,0 +1,396 @@
+const { COMPILE_BUILD_VARIANTS } = require("./compile-build-variants.js");
+
+//@ts-check
+
+/** @type {(import("./e2e-tests-build-variants.js").E2ETestsBuildVariantDefinition)[]} */
+exports.E2E_TESTS_BUILD_VARIANTS = [
+  {
+    displayName: "RHEL 7.0 x64",
+    runOn: "rhel70-large",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "RHEL 7.6 x64",
+    runOn: "rhel76-large",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "RHEL 8.0 x64",
+    runOn: "rhel80-small",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 9.0 x64",
+    runOn: "rhel90-small",
+    tags: ["nightly-driver"],
+    disableOpenSslSharedConfig: true,
+    executableOsId: "linux-x64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "RHEL 9.3 x64",
+    runOn: "rhel93-small",
+    tags: ["nightly-driver"],
+    disableOpenSslSharedConfig: true,
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 8.3 x64",
+    runOn: "rhel83-fips",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 8.3 x64",
+    runOn: "rhel83-fips",
+    tags: ["nightly-driver"],
+    sharedOpenSsl: "openssl11",
+    executableOsId: "linux-x64-openssl11",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 8.3 x64",
+    runOn: "rhel83-fips",
+    tags: ["nightly-driver"],
+    fips: true,
+    sharedOpenSsl: "openssl11",
+    executableOsId: "linux-x64-openssl11",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 9.3 x64",
+    runOn: "rhel93-fips",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 9.3 x64",
+    runOn: "rhel93-fips",
+    tags: ["nightly-driver"],
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-x64-openssl3",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 9.3 x64",
+    runOn: "rhel93-fips",
+    tags: ["nightly-driver"],
+    fips: true,
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-x64-openssl3",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 18.04 x64",
+    runOn: "ubuntu1804-large",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "6.0.x",
+  },
+  {
+    displayName: "Ubuntu 20.04 x64",
+    runOn: "ubuntu2004-small",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 20.04 x64",
+    runOn: "ubuntu2004-small",
+    tags: ["nightly-driver"],
+    sharedOpenSsl: "openssl11",
+    executableOsId: "linux-x64-openssl11",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 22.04 x64",
+    runOn: "ubuntu2204-small",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 22.04 x64",
+    runOn: "ubuntu2204-small",
+    tags: ["nightly-driver"],
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-x64-openssl3",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 24.04 x64",
+    runOn: "ubuntu2404-small",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 24.04 x64",
+    runOn: "ubuntu2404-small",
+    tags: ["nightly-driver"],
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-x64-openssl3",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Debian 10 x64",
+    runOn: "debian10-small",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "6.0.x",
+  },
+  {
+    displayName: "Debian 10 x64",
+    runOn: "debian10-small",
+    tags: ["nightly-driver"],
+    sharedOpenSsl: "openssl11",
+    executableOsId: "linux-x64-openssl11",
+    mVersion: "6.0.x",
+  },
+  {
+    displayName: "Debian 11 x64",
+    runOn: "debian11-small",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "Debian 11 x64",
+    runOn: "debian11-small",
+    tags: ["nightly-driver"],
+    sharedOpenSsl: "openssl11",
+    executableOsId: "linux-x64-openssl11",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "Amazon Linux 2 x64",
+    runOn: "amazon2-large",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "Amazon Linux 2023 x64",
+    runOn: "amazon2023.0-small",
+    tags: ["nightly-driver"],
+    disableOpenSslSharedConfig: true,
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "SLES 12 x64",
+    runOn: "suse12-sp5-large",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "SLES 15 x64",
+    runOn: "suse15sp4-small",
+    tags: ["nightly-driver"],
+    executableOsId: "linux-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 18.04 arm64",
+    runOn: "ubuntu1804-arm64-large",
+    executableOsId: "linux-arm64",
+    mVersion: "6.0.x",
+  },
+  {
+    displayName: "Ubuntu 20.04 arm64",
+    runOn: "ubuntu2004-arm64-small",
+    executableOsId: "linux-arm64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 20.04 arm64",
+    runOn: "ubuntu2004-arm64-small",
+    sharedOpenSsl: "openssl11",
+    executableOsId: "linux-arm64-openssl11",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 22.04 arm64",
+    runOn: "ubuntu2204-arm64-small",
+    executableOsId: "linux-arm64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 22.04 arm64",
+    runOn: "ubuntu2204-arm64-small",
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-arm64-openssl3",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 24.04 arm64",
+    runOn: "ubuntu2404-arm64-small",
+    executableOsId: "linux-arm64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Ubuntu 24.04 arm64",
+    runOn: "ubuntu2404-arm64-small",
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-arm64-openssl3",
+    mVersion: "stable",
+  },
+  {
+    displayName: "Amazon Linux 2 arm64",
+    runOn: "amazon2-arm64-large",
+    executableOsId: "linux-arm64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "Amazon Linux 2023 arm64",
+    runOn: "amazon2023.0-arm64-small",
+    disableOpenSslSharedConfig: true,
+    executableOsId: "linux-arm64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 8.2 arm64",
+    runOn: "rhel82-arm64-small",
+    executableOsId: "linux-arm64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 9.0 arm64",
+    runOn: "rhel90-arm64-small",
+    disableOpenSslSharedConfig: true,
+    executableOsId: "linux-arm64",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "RHEL 9.0 arm64",
+    runOn: "rhel90-arm64-small",
+    disableOpenSslSharedConfig: true,
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-arm64-openssl3",
+    mVersion: "7.0.x",
+  },
+  {
+    displayName: "RHEL 9.3 arm64",
+    runOn: "rhel93-arm64-small",
+    disableOpenSslSharedConfig: true,
+    executableOsId: "linux-arm64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 9.3 arm64",
+    runOn: "rhel93-arm64-small",
+    disableOpenSslSharedConfig: true,
+    sharedOpenSsl: "openssl3",
+    executableOsId: "linux-arm64-openssl3",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 8 PPC",
+    runOn: "rhel8-power-small",
+    executableOsId: "linux-ppc64le",
+    mVersion: "stable",
+  },
+  {
+    displayName: "RHEL 7 s390x",
+    runOn: "rhel7-zseries-large",
+    executableOsId: "linux-s390x",
+    mVersion: "6.0.x",
+  },
+  {
+    displayName: "RHEL 8 s390x",
+    runOn: "rhel8-zseries-small",
+    executableOsId: "linux-s390x",
+    mVersion: "stable",
+  },
+  {
+    displayName: "MacOS 14 x64",
+    runOn: "macos-14",
+    executableOsId: "darwin-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "MacOS 14 arm64",
+    runOn: "macos-14-arm64",
+    executableOsId: "darwin-arm64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "MacOS Big Sur",
+    id: "darwin",
+    runOn: "macos-11",
+    executableOsId: "darwin-x64",
+    mVersion: "stable",
+  },
+  {
+    displayName: "MacOS Big Sur arm64",
+    runOn: "macos-11-arm64",
+    id: "darwin_arm64",
+    executableOsId: "darwin-arm64",
+    mVersion: "stable",
+    additionalTasks: [
+      "package_artifact_darwin_x64",
+      "sign_artifact_darwin_x64",
+      "package_artifact_darwin_arm64",
+      "sign_artifact_darwin_arm64",
+    ],
+  },
+  {
+    displayName: "Windows VS 2022",
+    runOn: "windows-vsCurrent-small",
+    executableOsId: "win32",
+    mVersion: "stable",
+    additionalTasks: [
+      "package_artifact_win32_x64",
+      "package_artifact_win32msi_x64",
+    ],
+  },
+].map((buildVariant) => {
+  const { displayName, fips, sharedOpenSsl, mVersion, runOn, executableOsId } =
+    buildVariant;
+  let id = (buildVariant.id ?? runOn ?? executableOsId).replaceAll("-", "_");
+
+  const name = [
+    "e2e_tests",
+    id,
+    sharedOpenSsl,
+    mVersion != "stable" ? `m${mVersion.replaceAll(".", "")}` : undefined,
+    fips,
+  ]
+    .filter((text) => text)
+    .join("_");
+
+  const formattedDisplayName = [
+    displayName,
+    mVersion != "stable" ? mVersion.replaceAll(".", "") : undefined,
+    sharedOpenSsl,
+    fips ? "FIPS" : undefined,
+    "(E2E tests)",
+  ]
+    .filter((text) => text)
+    .join(" ");
+
+  let compileBuildVariant = COMPILE_BUILD_VARIANTS.find(
+    (pkg) => pkg.executableOsId == executableOsId
+  )?.name;
+
+  if (!compileBuildVariant)
+    throw new Error(`Compile build variant not found for ${executableOsId}`);
+
+  return {
+    ...buildVariant,
+    id,
+    displayName: formattedDisplayName,
+    name,
+    compileBuildVariant,
+  };
+});
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index 352f36062..a319c8c6b 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -30,8 +30,6 @@ const MONGOSH_PACKAGES = fs.readdirSync(pathToPackages, { withFileTypes: true })
     ...(JSON.parse(fs.readFileSync(path.join(pathToPackages, d.name, 'package.json'))).mongosh || {})
   }));
 
-const ALL_UNIT_TEST_BUILD_VARIANTS = [];
-const ALL_UNIT_TESTS = [];
 const platformToDetails = {
   'darwin': { displayName: 'MacOS 14 arm64', runOn: 'macos-14-arm64', executableOsId: 'darwin-arm64' },
   'linux': { displayName: 'Ubuntu 20.04 x64', runOn: 'ubuntu2004-small', executableOsId: 'darwin-arm64', tags: ["nightly-driver"]},
@@ -39,10 +37,13 @@ const platformToDetails = {
 }
 const defaultVariants = ['darwin', 'linux', 'win32'];
 
+const UNIT_TESTS_BUILD_VARIANTS = [];
+const UNIT_TESTS = [];
+
 for (const { shortName: nShort, versionSpec: nVersion, skipNodeVersionCheck } of NODE_VERSIONS) {
   for (const platform of defaultVariants) {
-const platformDetails = platformToDetails[platform];
-  ALL_UNIT_TEST_BUILD_VARIANTS.push({
+  const platformDetails = platformToDetails[platform];
+  UNIT_TESTS_BUILD_VARIANTS.push({
           ...platformDetails,
           name: `${platform}-n${nShort}`,
           displayName: `${platformDetails.displayName} n${nShort} (Unit tests)`,
@@ -60,7 +61,7 @@ const platformDetails = platformToDetails[platform];
           // Unit tests on macOS use arm64 and therefore require 6.0+
           continue;
         }
-        ALL_UNIT_TEST_BUILD_VARIANTS.push({
+        UNIT_TESTS_BUILD_VARIANTS.push({
           ...platformDetails,
           name: `tests_${platform}-m${mShort}_n${nShort}`,
           id: `${platform}-m${mShort}_n${nShort}`,
@@ -74,11 +75,12 @@ const platformDetails = platformToDetails[platform];
   }
 }
 
+
 for (const packageInfo of MONGOSH_PACKAGES) {
   const id = `${packageInfo.name.replace(/-/g, '_')}`;
 
   const variants = packageInfo.variants ?? defaultVariants
-  ALL_UNIT_TESTS.push({
+  UNIT_TESTS.push({
     id,
     packageName: packageInfo.name,
     unitTestsOnly: packageInfo.unitTestsOnly,
@@ -86,8 +88,10 @@ for (const packageInfo of MONGOSH_PACKAGES) {
   });
 }
 
+const { E2E_TESTS_BUILD_VARIANTS } = require('./build-variants/e2e-tests-build-variants')
+const { COMPILE_BUILD_VARIANTS } = require('./build-variants/compile-build-variants')
+const { RELEASE_PACKAGE_MATRIX } = require('../config/release-package-matrix')
 
-const { RELEASE_PACKAGE_MATRIX } = require('../config/release-package-matrix');
 
 %>
 exec_timeout_secs: 10800
@@ -301,8 +305,8 @@ functions:
         content_type: application/x-gzip
 
   check_coverage:
-    <% for (let variant of ALL_UNIT_TEST_BUILD_VARIANTS) {
-        for (let unitTest of ALL_UNIT_TESTS.filter(t => t.variants.includes(variant.platform) && (!t.unitTestsOnly || (t.unitTestsOnly && variant.runWithUnitTestsOnly)))) {
+    <% for (let variant of UNIT_TESTS_BUILD_VARIANTS) {
+        for (let unitTest of UNIT_TESTS.filter(t => t.variants.includes(variant.platform) && (!t.unitTestsOnly || (t.unitTestsOnly && variant.runWithUnitTestsOnly)))) {
         let buildVariant = variant.id;
          %>
     - command: s3.get
@@ -1139,7 +1143,7 @@ tasks:
   # UNIT TESTS
   # E.g. test_m60xc_n20 stands for mongod 6.0.x, community edition, Node.js 20
   ###
-  <% for (const { id, packageName } of ALL_UNIT_TESTS) { %>
+  <% for (const { id, packageName } of UNIT_TESTS) { %>
   - name: test_<% out(id) %>
     tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
     depends_on:
@@ -1243,35 +1247,36 @@ tasks:
   ###
   # E2E TESTS
   ###
-  <% for (const { executableOsId, compileBuildVariant } of RELEASE_PACKAGE_MATRIX) {
-    for (const mVersion of ['stable', '7.0.x', '6.0.x']) {
-      for (const fipsVariant of ['fips', 'nofips']) {
+  # Tests reuse the same compilation build variant, so we create those variations based on this.
+  <% for (const compileBuildVariant of COMPILE_BUILD_VARIANTS) { 
+    const platformName = compileBuildVariant.name.replace('build_', '');
+    const executableOsId = platformName == 'darwin' ? 'darwin-x64' : platformName.replaceAll('_', '-');
     %>
-  - name: e2e_tests_<% out(executableOsId.replace(/-/g, '_')) %><% out(mVersion === 'stable' ? '' : '_' + mVersion.replace(/[^a-zA-Z0-9]/g, '')) %><% out(fipsVariant === 'fips' ? '_fips' : '') %>
-    tags: ["e2e-test"]
+  - name: e2e_tests_<% out(platformName) %>
+    tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
-        variant: <% out(compileBuildVariant) %>
+        variant: <% out(compileBuildVariant.name) %>
     commands:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_20) %>"
+          node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
           executable_os_id: <% out(executableOsId) %>
       - func: run_e2e_tests
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_20) %>"
-          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}
-  <% } } %>
-  - name: perf_tests_<% out(executableOsId.replace(/-/g, '_')) %>
+          node_js_version: ${node_js_version}
+          mongosh_server_test_version: ${mongosh_server_test_version}
+          mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
+          disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false} 
+  <% } %>
+  - name: perf_tests
     tags: ["perf-test"]
     depends_on:
       - name: compile_artifact
-        variant: <% out(compileBuildVariant) %>
+        variant: build_linux_x64
     commands:
       - func: checkout
       - func: install
@@ -1279,10 +1284,9 @@ tasks:
           node_js_version: "<% out(NODE_JS_VERSION_20) %>"
       - func: download_compiled_artifact
         vars:
-          executable_os_id: <% out(executableOsId) %>
+          executable_os_id: "linux-x64"
       - func: run_perf_tests
-  <% } %>
-
+  
   ###
   # EXECUTABLE CONNECTIVITY TESTS
   ###
@@ -1540,7 +1544,7 @@ tasks:
 
 # Need to run builds for every possible build variant.
 buildvariants:
-  <% for (const variant of ALL_UNIT_TEST_BUILD_VARIANTS) { %>
+  <% for (const variant of UNIT_TESTS_BUILD_VARIANTS) { %>
   - name: <% out(variant.name) %>
     display_name: "<% out(variant.displayName) %>"
     run_on: <% out(variant.runOn) %>
@@ -1551,30 +1555,41 @@ buildvariants:
       node_js_version: "<% out(variant.nVersion) %>"
       mongosh_skip_node_version_check: "<% out(variant.skipNodeVersionCheck) %>"
     tasks:
-     <% for (const test of ALL_UNIT_TESTS.filter(test => test.variants.includes(variant.platform))) { %>
+     <% for (const test of UNIT_TESTS.filter(test => test.variants.includes(variant.platform))) { %>
       - name: test_<% out(test.id) %>
       <% } %>
   <% } %>
-  - name: darwin
-    display_name: "MacOS Big Sur"
-    run_on: macos-11
+  <% for (const variant of COMPILE_BUILD_VARIANTS) { %>
+  - name: <% out(variant.name) %>
+    display_name: "<% out(variant.displayName) %>"
+    run_on: <% out(variant.runOn) %>
     expansions:
-      executable_os_id: darwin-x64
+      executable_os_id: "<% out(variant.executableOsId) %>"
+      node_js_version: "<% out(NODE_JS_VERSION_20) %>"
+      <% if (variant.sharedOpenSsl) { %>
+      mongosh_shared_openssl: "<% out(variant.sharedOpenSsl) %>"
+      <% } %>
     tasks:
       - name: compile_artifact
-      - name: e2e_tests_darwin_x64
-  - name: darwin_arm64
-    display_name: "MacOS Big Sur (arm64)"
-    run_on: macos-11-arm64
+  <% } %>
+  <% for (const variant of E2E_TESTS_BUILD_VARIANTS) { %>
+  - name: <% out(variant.name) %>
+    display_name: "<% out(variant.displayName) %>"
+    run_on: <% out(variant.runOn) %>
+    tags: <% out([...(variant.tags ?? [])]) %>
     expansions:
-      executable_os_id: darwin-arm64
-    tasks:
-      - name: compile_artifact
-      - name: e2e_tests_darwin_arm64
-      - name: package_artifact_darwin_x64
-      - name: sign_artifact_darwin_x64
-      - name: package_artifact_darwin_arm64
-      - name: sign_artifact_darwin_arm64
+      executable_os_id: "<% out(variant.executableOsId) %>"
+      disable_openssl_shared_config_for_bundled_openssl: <% out(variant.disableOpenSslSharedConfig || false) %>
+      node_js_version: "<% out(NODE_JS_VERSION_20) %>"
+      mongosh_server_test_version: "<% out(variant.mVersion) %>-enterprise"
+      mongosh_test_e2e_force_fips: "<% out(variant.fips ? '1' : '') %>"
+    tasks:
+      <% 
+      let tasks = [`e2e_tests_${variant.compileBuildVariant.replace('build_', '')}`, ...(variant.additionalTasks ?? [])];
+      for (const task of tasks) { %>
+      - name: <% out(task) %>
+      <% } %>
+  <% } %>
 
   - name: linux_compile
     display_name: "Ubuntu 20.04 x64 (Compile and Check)"
@@ -1636,314 +1651,6 @@ buildvariants:
     tasks:
       - name: verify_artifact_darwin_arm64
       - name: verify_artifact_darwin_x64
-  - name: linux_x64_build
-    display_name: "RHEL 7.0 x64 (build)"
-    run_on: rhel70-build
-    expansions:
-      executable_os_id: linux-x64
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_rhel8
-    display_name: "RHEL 8.0 x64 (build)"
-    run_on: rhel80-build
-    expansions:
-      executable_os_id: linux-x64
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl11
-    display_name: "RHEL 7.0 x64 (build, shared OpenSSL 1.1)"
-    run_on: rhel70-build
-    expansions:
-      executable_os_id: linux-x64-openssl11
-      mongosh_shared_openssl: openssl11
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl11_rhel8
-    display_name: "RHEL 8.0 x64 (build, shared OpenSSL 1.1)"
-    run_on: rhel80-build
-    expansions:
-      executable_os_id: linux-x64-openssl11
-      mongosh_shared_openssl: openssl11
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl3
-    display_name: "RHEL 7.0 x64 (build, shared OpenSSL 3)"
-    run_on: rhel70-build
-    expansions:
-      executable_os_id: linux-x64-openssl3
-      mongosh_shared_openssl: openssl3
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_x64_build_openssl3_rhel8
-    display_name: "RHEL 8.0 x64 (build, shared OpenSSL 3)"
-    run_on: rhel80-build
-    expansions:
-      executable_os_id: linux-x64-openssl3
-      mongosh_shared_openssl: openssl3
-    tags: ["nightly-driver"]
-    tasks:
-      - name: compile_artifact
-  - name: linux_arm64_build
-    display_name: "Amazon 2 arm64 (build)"
-    run_on: amazon2-arm64-large
-    expansions:
-      executable_os_id: linux-arm64
-    tasks:
-      - name: compile_artifact
-  - name: linux_arm64_build_openssl11
-    display_name: "Amazon 2 arm64 (build, shared OpenSSL 1.1)"
-    run_on: amazon2-arm64-large
-    expansions:
-      executable_os_id: linux-arm64-openssl11
-      mongosh_shared_openssl: openssl11
-    tasks:
-      - name: compile_artifact
-  - name: linux_arm64_build_openssl3
-    display_name: "Amazon 2 arm64 (build, shared OpenSSL 3)"
-    run_on: amazon2-arm64-large
-    expansions:
-      executable_os_id: linux-arm64-openssl3
-      mongosh_shared_openssl: openssl3
-    tasks:
-      - name: compile_artifact
-  - name: linux_ppc64le_build
-    display_name: "RHEL 8 PPC (build)"
-    run_on: rhel8-power-small
-    expansions:
-      executable_os_id: linux-ppc64le
-    tasks:
-      - name: compile_artifact
-  - name: linux_s390x_build
-    display_name: "RHEL 7 s390x (build)"
-    run_on: rhel7-zseries-large
-    expansions:
-      executable_os_id: linux-s390x
-    tasks:
-      - name: compile_artifact
-
-  - name: e2e_rhel70_x64
-    display_name: "RHEL 7.0 x64 (E2E Tests)"
-    run_on: rhel70-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_rhel76_x64
-    display_name: "RHEL 7.6 x64 (E2E Tests)"
-    run_on: rhel76-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_rhel80_x64
-    display_name: "RHEL 8.0 x64 (E2E Tests)"
-    run_on: rhel80-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_rhel90_x64
-    display_name: "RHEL 9.0 x64 (E2E Tests)"
-    run_on: rhel90-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_rhel93_x64
-    display_name: "RHEL 9.3 x64 (E2E Tests)"
-    run_on: rhel93-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_rhel83_x64
-    display_name: "RHEL 8.3 x64 (E2E Tests, FIPS-available OS)"
-    run_on: rhel83-fips
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl11
-      - name: e2e_tests_linux_x64_openssl11_fips
-  - name: e2e_rhel93_fips_x64
-    display_name: "RHEL 9.3 x64 (E2E Tests, FIPS-available OS)"
-    run_on: rhel93-fips
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl3
-      - name: e2e_tests_linux_x64_openssl3_fips
-  - name: e2e_ubuntu1804_x64
-    display_name: "Ubuntu 18.04 x64 (E2E Tests)"
-    run_on: ubuntu1804-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_60x
-  - name: e2e_ubuntu2004_x64
-    display_name: "Ubuntu 20.04 x64 (E2E Tests)"
-    run_on: ubuntu2004-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl11
-  - name: e2e_ubuntu2204_x64
-    display_name: "Ubuntu 22.04 x64 (E2E Tests)"
-    run_on: ubuntu2204-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl3
-  - name: e2e_ubuntu2404_x64
-    display_name: "Ubuntu 24.04 x64 (E2E Tests)"
-    run_on: ubuntu2404-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl3
-  - name: e2e_debian10_x64
-    display_name: "Debian 10 x64 (E2E Tests)"
-    run_on: debian10-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_60x
-      - name: e2e_tests_linux_x64_openssl11_60x
-  - name: e2e_debian11_x64
-    display_name: "Debian 11 x64 (E2E Tests)"
-    run_on: debian11-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-      - name: e2e_tests_linux_x64_openssl11_70x
-  - name: e2e_amazon2_x64
-    display_name: "Amazon Linux 2 x64 (E2E Tests)"
-    run_on: amazon2-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_amazon2023_x64
-    display_name: "Amazon Linux 2023 x64 (E2E Tests)"
-    run_on: amazon2023.0-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_suse12_x64
-    display_name: "SLES 12 x64 (E2E Tests)"
-    run_on: suse12-sp5-large
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64_70x
-  - name: e2e_suse15_x64
-    display_name: "SLES 15 x64 (E2E Tests)"
-    run_on: suse15sp4-small
-    tags: ["nightly-driver"]
-    tasks:
-      - name: e2e_tests_linux_x64
-  - name: e2e_ubuntu1804_arm64
-    display_name: "Ubuntu 18.04 arm64 (E2E Tests)"
-    run_on: ubuntu1804-arm64-large
-    tasks:
-      - name: e2e_tests_linux_arm64_60x
-  - name: e2e_ubuntu2004_arm64
-    display_name: "Ubuntu 20.04 arm64 (E2E Tests)"
-    run_on: ubuntu2004-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl11
-  - name: e2e_ubuntu2204_arm64
-    display_name: "Ubuntu 22.04 arm64 (E2E Tests)"
-    run_on: ubuntu2204-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_ubuntu2404_arm64
-    display_name: "Ubuntu 24.04 arm64 (E2E Tests)"
-    run_on: ubuntu2404-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_amazon2_arm64
-    display_name: "Amazon Linux 2 arm64 (E2E Tests)"
-    run_on: amazon2-arm64-large
-    tasks:
-      - name: e2e_tests_linux_arm64_70x
-  - name: e2e_amazon2023_arm64
-    display_name: "Amazon Linux 2023 arm64 (E2E Tests)"
-    run_on: amazon2023.0-arm64-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tasks:
-      - name: e2e_tests_linux_arm64
-  - name: e2e_rhel82_arm64
-    display_name: "RHEL 8.2 arm64 (E2E Tests)"
-    run_on: rhel82-arm64-small
-    tasks:
-      - name: e2e_tests_linux_arm64
-  - name: e2e_rhel90_arm64
-    display_name: "RHEL 9.0 arm64 (E2E Tests)"
-    run_on: rhel90-arm64-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tasks:
-      - name: e2e_tests_linux_arm64_70x
-      - name: e2e_tests_linux_arm64_openssl3_70x
-  - name: e2e_rhel93_arm64
-    display_name: "RHEL 9.3 arm64 (E2E Tests)"
-    run_on: rhel93-arm64-small
-    expansions:
-      disable_openssl_shared_config_for_bundled_openssl: true
-    tasks:
-      - name: e2e_tests_linux_arm64
-      - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel8_ppc64le
-    display_name: "RHEL 8 PPC (E2E Tests)"
-    run_on: rhel8-power-small
-    tasks:
-      - name: e2e_tests_linux_ppc64le
-  - name: e2e_rhel7_s390x
-    display_name: "RHEL 7 s390x (E2E Tests)"
-    run_on: rhel7-zseries-large
-    tasks:
-      - name: e2e_tests_linux_s390x_60x
-  - name: e2e_rhel8_s390x
-    display_name: "RHEL 8 s390x (E2E Tests)"
-    run_on: rhel8-zseries-small
-    tasks:
-      - name: e2e_tests_linux_s390x
-  - name: e2e_macos14_x64
-    display_name: "MacOS 14 x64 (E2E Tests)"
-    run_on: macos-14
-    expansions:
-      executable_os_id: darwin-x64
-    tasks:
-      - name: e2e_tests_darwin_x64
-  - name: e2e_macos14_arm64
-    display_name: "MacOS 14 arm64 (E2E Tests)"
-    run_on: macos-14-arm64
-    expansions:
-      executable_os_id: darwin-arm64
-    tasks:
-      - name: e2e_tests_darwin_arm64
-  - name: win32
-    display_name: "Windows VS 2022"
-    run_on: windows-vsCurrent-small
-    expansions:
-      executable_os_id: win32
-    tasks:
-      - name: e2e_tests_win32
-      - name: package_artifact_win32_x64
-      - name: package_artifact_win32msi_x64
-  - name: win32_build
-    display_name: "Windows VS 2022 (build)"
-    run_on: windows-vsCurrent-large
-    expansions:
-      executable_os_id: win32
-    tasks:
-      - name: compile_artifact
 
   - name: pkg_smoke_tests_docker_x64
     display_name: "package smoke (x64 Docker)"
@@ -2064,4 +1771,4 @@ buildvariants:
     display_name: "Performance Tests"
     run_on: rhel90-dbx-perf-large
     tasks:
-      - name: perf_tests_linux_x64
+      - name: perf_tests
diff --git a/config/.prettierrc.json b/config/.prettierrc.json
new file mode 100644
index 000000000..dfae21d04
--- /dev/null
+++ b/config/.prettierrc.json
@@ -0,0 +1 @@
+"@mongodb-js/prettier-config-devtools"
diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js
index f2a19ba0d..e132d3525 100644
--- a/config/release-package-matrix.js
+++ b/config/release-package-matrix.js
@@ -1,12 +1,32 @@
 'use strict';
 
-const rhel81AndAbove = ['rhel81', 'rhel82', 'rhel83', 'rhel90']
-const rhel80AndAbove = ['rhel80', ...rhel81AndAbove]
-const rhel72AndAbove = ['rhel72', ...rhel80AndAbove]
-const al2AndAbove = ['amazon2', 'amazon2023', ...rhel81AndAbove]
-const rhel70AndAboveAndRpmBased = ['rhel70', 'rhel71', ...rhel72AndAbove, 'amazon', ...al2AndAbove, 'suse12', 'suse15']
-const ubuntu1804AndAboveAndDebBased = ['ubuntu1804', 'ubuntu1804', 'ubuntu2004', 'ubuntu2204', 'ubuntu2404', 'debian10', 'debian11', 'debian12']
-const allLinux = [...rhel70AndAboveAndRpmBased, ...ubuntu1804AndAboveAndDebBased]
+const rhel81AndAbove = ['rhel81', 'rhel82', 'rhel83', 'rhel90'];
+const rhel80AndAbove = ['rhel80', ...rhel81AndAbove];
+const rhel72AndAbove = ['rhel72', ...rhel80AndAbove];
+const al2AndAbove = ['amazon2', 'amazon2023', ...rhel81AndAbove];
+const rhel70AndAboveAndRpmBased = [
+  'rhel70',
+  'rhel71',
+  ...rhel72AndAbove,
+  'amazon',
+  ...al2AndAbove,
+  'suse12',
+  'suse15',
+];
+const ubuntu1804AndAboveAndDebBased = [
+  'ubuntu1804',
+  'ubuntu1804',
+  'ubuntu2004',
+  'ubuntu2204',
+  'ubuntu2404',
+  'debian10',
+  'debian11',
+  'debian12',
+];
+const allLinux = [
+  ...rhel70AndAboveAndRpmBased,
+  ...ubuntu1804AndAboveAndDebBased,
+];
 
 const publicDescriptions = {
   darwin_x64: 'MacOS x64 (11.0+)',
@@ -21,7 +41,7 @@ const publicDescriptions = {
   rhel_ppc64le: 'RHEL / CentOS (7+) ppc64le',
   linux_s390x: 'Linux s390x',
   rhel_s390x: 'RHEL / CentOS (7+) s390x',
-  win32_x64: 'Windows x64 (10+)'
+  win32_x64: 'Windows x64 (10+)',
 };
 
 const krbConnTestsOpenSSL11 = ['rocky8', 'ubuntu2004'];
@@ -30,100 +50,375 @@ const krbConnTestsOpenSSL3 = ['node20', 'rocky9', 'ubuntu2204'];
 exports.RELEASE_PACKAGE_MATRIX = [
   {
     executableOsId: 'darwin-x64',
-    compileBuildVariant: 'darwin',
+    compileBuildVariant: 'build_darwin',
     packages: [
-      { name: 'darwin-x64', description: publicDescriptions.darwin_x64, packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] }
-    ]
+      {
+        name: 'darwin-x64',
+        description: publicDescriptions.darwin_x64,
+        packageType: 'zip',
+        packageOn: 'darwin',
+        smokeTestKind: 'macos',
+        serverLikeTargetList: ['macos'],
+      },
+    ],
   },
   {
     executableOsId: 'darwin-arm64',
-    compileBuildVariant: 'darwin_arm64',
+    compileBuildVariant: 'build_darwin_arm64',
     packages: [
-      { name: 'darwin-arm64', description: publicDescriptions.darwin_arm64, packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] }
-    ]
+      {
+        name: 'darwin-arm64',
+        description: publicDescriptions.darwin_arm64,
+        packageType: 'zip',
+        packageOn: 'darwin',
+        smokeTestKind: 'macos',
+        serverLikeTargetList: ['macos'],
+      },
+    ],
   },
   {
     executableOsId: 'linux-x64',
-    compileBuildVariant: 'linux_x64_build',
-    kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11, ...krbConnTestsOpenSSL3],
+    compileBuildVariant: 'build_linux_x64',
+    kerberosConnectivityTestDockerfiles: [
+      ...krbConnTestsOpenSSL11,
+      ...krbConnTestsOpenSSL3,
+    ],
     packages: [
-      { name: 'linux-x64', description: publicDescriptions.linux_x64, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] },
-      { name: 'deb-x64', description: publicDescriptions.debian_x64, packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'ubuntu22.04-qemu-deb', 'ubuntu24.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] },
-      { name: 'rpm-x64', description: publicDescriptions.rhel_x64, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'oraclelinux9-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] }
-    ]
+      {
+        name: 'linux-x64',
+        description: publicDescriptions.linux_x64,
+        packageType: 'tgz',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: ['ubuntu20.04-tgz'],
+        serverLikeTargetList: [...allLinux],
+      },
+      {
+        name: 'deb-x64',
+        description: publicDescriptions.debian_x64,
+        packageType: 'deb',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'ubuntu18.04-deb',
+          'ubuntu20.04-deb',
+          'ubuntu22.04-deb',
+          'ubuntu22.04-nohome-deb',
+          'ubuntu22.04-qemu-deb',
+          'ubuntu24.04-deb',
+          'debian10-deb',
+          'debian11-deb',
+          'debian12-deb',
+        ],
+        serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased],
+      },
+      {
+        name: 'rpm-x64',
+        description: publicDescriptions.rhel_x64,
+        packageType: 'rpm',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'centos7-rpm',
+          'amazonlinux2-rpm',
+          'amazonlinux2023-rpm',
+          'rocky8-rpm',
+          'rocky9-rpm',
+          'fedora34-rpm',
+          'suse12-rpm',
+          'suse15-rpm',
+          'oraclelinux9-rpm',
+        ],
+        serverLikeTargetList: [...rhel70AndAboveAndRpmBased],
+      },
+    ],
   },
   {
     executableOsId: 'linux-x64-openssl11',
-    compileBuildVariant: 'linux_x64_build_openssl11',
+    compileBuildVariant: 'build_linux_x64_openssl11',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11],
     packages: [
-      { name: 'linux-x64-openssl11', description: publicDescriptions.linux_x64, packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] },
-      { name: 'deb-x64-openssl11', description: publicDescriptions.debian_x64, packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] },
-      { name: 'rpm-x64-openssl11', description: publicDescriptions.rhel_x64, packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] }
-    ]
+      {
+        name: 'linux-x64-openssl11',
+        description: publicDescriptions.linux_x64,
+        packageType: 'tgz with shared OpenSSL 1.1',
+        packageOn: 'linux_package',
+        smokeTestKind: 'none',
+        serverLikeTargetList: [...allLinux],
+      },
+      {
+        name: 'deb-x64-openssl11',
+        description: publicDescriptions.debian_x64,
+        packageType: 'deb with shared OpenSSL 1.1',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'ubuntu20.04-deb',
+          'debian10-deb',
+          'debian11-deb',
+        ],
+        serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased],
+      },
+      {
+        name: 'rpm-x64-openssl11',
+        description: publicDescriptions.rhel_x64,
+        packageType: 'rpm with shared OpenSSL 1.1',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'centos7-epel-rpm',
+          'amazonlinux2-rpm',
+          'rocky8-rpm',
+          'rocky9-rpm',
+          'fedora34-rpm',
+        ],
+        serverLikeTargetList: [...rhel70AndAboveAndRpmBased],
+      },
+    ],
   },
   {
     executableOsId: 'linux-x64-openssl3',
-    compileBuildVariant: 'linux_x64_build_openssl3',
+    compileBuildVariant: 'build_linux_x64_openssl3',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL3],
     packages: [
-      { name: 'linux-x64-openssl3', description: publicDescriptions.linux_x64, packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] },
-      { name: 'deb-x64-openssl3', description: publicDescriptions.debian_x64, packageType: 'deb with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] },
-      { name: 'rpm-x64-openssl3', description: publicDescriptions.rhel_x64, packageType: 'rpm with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] }
-    ]
+      {
+        name: 'linux-x64-openssl3',
+        description: publicDescriptions.linux_x64,
+        packageType: 'tgz with shared OpenSSL 3',
+        packageOn: 'linux_package',
+        smokeTestKind: 'none',
+        serverLikeTargetList: [...allLinux],
+      },
+      {
+        name: 'deb-x64-openssl3',
+        description: publicDescriptions.debian_x64,
+        packageType: 'deb with shared OpenSSL 3',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'ubuntu22.04-deb',
+          'ubuntu22.04-fips-deb',
+          'debian12-deb',
+        ],
+        serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased],
+      },
+      {
+        name: 'rpm-x64-openssl3',
+        description: publicDescriptions.rhel_x64,
+        packageType: 'rpm with shared OpenSSL 3',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'rocky8-epel-rpm',
+          'rocky9-rpm',
+          'rocky9-fips-rpm',
+          'amazonlinux2023-rpm',
+        ],
+        serverLikeTargetList: [...rhel70AndAboveAndRpmBased],
+      },
+    ],
   },
   {
     executableOsId: 'linux-arm64',
-    compileBuildVariant: 'linux_arm64_build',
-    kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11, ...krbConnTestsOpenSSL3],
+    compileBuildVariant: 'build_linux_arm64',
+    kerberosConnectivityTestDockerfiles: [
+      ...krbConnTestsOpenSSL11,
+      ...krbConnTestsOpenSSL3,
+    ],
     packages: [
-      { name: 'linux-arm64', description: publicDescriptions.linux_arm64, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] },
-      { name: 'deb-arm64', description: publicDescriptions.debian_arm64, packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'ubuntu22.04-qemu-deb', 'ubuntu24.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] },
-      { name: 'rpm-arm64', description: publicDescriptions.rhel_arm64, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] }
-    ]
+      {
+        name: 'linux-arm64',
+        description: publicDescriptions.linux_arm64,
+        packageType: 'tgz',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: ['ubuntu20.04-tgz'],
+        serverLikeTargetList: [...al2AndAbove],
+      },
+      {
+        name: 'deb-arm64',
+        description: publicDescriptions.debian_arm64,
+        packageType: 'deb',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'ubuntu18.04-deb',
+          'ubuntu20.04-deb',
+          'ubuntu22.04-deb',
+          'ubuntu22.04-nohome-deb',
+          'ubuntu22.04-qemu-deb',
+          'ubuntu24.04-deb',
+          'debian10-deb',
+          'debian11-deb',
+          'debian12-deb',
+        ],
+        serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased],
+      },
+      {
+        name: 'rpm-arm64',
+        description: publicDescriptions.rhel_arm64,
+        packageType: 'rpm',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'rocky8-rpm',
+          'rocky9-rpm',
+          'fedora34-rpm',
+          'amazonlinux2-rpm',
+          'amazonlinux2023-rpm',
+        ],
+        serverLikeTargetList: [...al2AndAbove],
+      },
+    ],
   },
   {
     executableOsId: 'linux-arm64-openssl11',
-    compileBuildVariant: 'linux_arm64_build_openssl11',
+    compileBuildVariant: 'build_linux_arm64_openssl11',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11],
     packages: [
-      { name: 'linux-arm64-openssl11', description: publicDescriptions.linux_arm64, packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] },
-      { name: 'deb-arm64-openssl11', description: publicDescriptions.debian_arm64, packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] },
-      { name: 'rpm-arm64-openssl11', description: publicDescriptions.rhel_arm64, packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] }
-    ]
+      {
+        name: 'linux-arm64-openssl11',
+        description: publicDescriptions.linux_arm64,
+        packageType: 'tgz with shared OpenSSL 1.1',
+        packageOn: 'linux_package',
+        smokeTestKind: 'none',
+        serverLikeTargetList: [...al2AndAbove],
+      },
+      {
+        name: 'deb-arm64-openssl11',
+        description: publicDescriptions.debian_arm64,
+        packageType: 'deb with shared OpenSSL 1.1',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'ubuntu20.04-deb',
+          'debian10-deb',
+          'debian11-deb',
+        ],
+        serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased],
+      },
+      {
+        name: 'rpm-arm64-openssl11',
+        description: publicDescriptions.rhel_arm64,
+        packageType: 'rpm with shared OpenSSL 1.1',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'rocky8-rpm',
+          'rocky9-rpm',
+          'fedora34-rpm',
+          'amazonlinux2-rpm',
+        ],
+        serverLikeTargetList: [...al2AndAbove],
+      },
+    ],
   },
   {
     executableOsId: 'linux-arm64-openssl3',
-    compileBuildVariant: 'linux_arm64_build_openssl3',
+    compileBuildVariant: 'build_linux_arm64_openssl3',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL3],
     packages: [
-      { name: 'linux-arm64-openssl3', description: publicDescriptions.linux_arm64, packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] },
-      { name: 'deb-arm64-openssl3', description: publicDescriptions.debian_arm64, packageType: 'deb with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] },
-      { name: 'rpm-arm64-openssl3', description: publicDescriptions.rhel_arm64, packageType: 'rpm with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] }
-    ]
+      {
+        name: 'linux-arm64-openssl3',
+        description: publicDescriptions.linux_arm64,
+        packageType: 'tgz with shared OpenSSL 3',
+        packageOn: 'linux_package',
+        smokeTestKind: 'none',
+        serverLikeTargetList: [...al2AndAbove],
+      },
+      {
+        name: 'deb-arm64-openssl3',
+        description: publicDescriptions.debian_arm64,
+        packageType: 'deb with shared OpenSSL 3',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'ubuntu22.04-deb',
+          'ubuntu22.04-fips-deb',
+          'debian12-deb',
+        ],
+        serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased],
+      },
+      {
+        name: 'rpm-arm64-openssl3',
+        description: publicDescriptions.rhel_arm64,
+        packageType: 'rpm with shared OpenSSL 3',
+        packageOn: 'linux_package',
+        smokeTestKind: 'docker',
+        smokeTestDockerfiles: [
+          'rocky8-epel-rpm',
+          'rocky9-rpm',
+          'rocky9-fips-rpm',
+          'amazonlinux2023-rpm',
+        ],
+        serverLikeTargetList: [...al2AndAbove],
+      },
+    ],
   },
   {
     executableOsId: 'linux-ppc64le',
-    compileBuildVariant: 'linux_ppc64le_build',
+    compileBuildVariant: 'build_linux_ppc64le',
     packages: [
-      { name: 'linux-ppc64le', description: publicDescriptions.linux_ppc64le, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] },
-      { name: 'rpm-ppc64le', description: publicDescriptions.rhel_ppc64le, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] }
-    ]
+      {
+        name: 'linux-ppc64le',
+        description: publicDescriptions.linux_ppc64le,
+        packageType: 'tgz',
+        packageOn: 'linux_package',
+        smokeTestKind: 'none',
+        serverLikeTargetList: [...rhel81AndAbove],
+      },
+      {
+        name: 'rpm-ppc64le',
+        description: publicDescriptions.rhel_ppc64le,
+        packageType: 'rpm',
+        packageOn: 'linux_package',
+        smokeTestKind: 'rpmextract',
+        serverLikeTargetList: [...rhel81AndAbove],
+      },
+    ],
   },
   {
     executableOsId: 'linux-s390x',
-    compileBuildVariant: 'linux_s390x_build',
+    compileBuildVariant: 'build_linux_s390x',
     packages: [
-      { name: 'linux-s390x', description: publicDescriptions.linux_s390x, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] },
-      { name: 'rpm-s390x', description: publicDescriptions.rhel_s390x, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] }
-    ]
+      {
+        name: 'linux-s390x',
+        description: publicDescriptions.linux_s390x,
+        packageType: 'tgz',
+        packageOn: 'linux_package',
+        smokeTestKind: 'none',
+        serverLikeTargetList: [...rhel72AndAbove],
+      },
+      {
+        name: 'rpm-s390x',
+        description: publicDescriptions.rhel_s390x,
+        packageType: 'rpm',
+        packageOn: 'linux_package',
+        smokeTestKind: 'rpmextract',
+        serverLikeTargetList: [...rhel72AndAbove],
+      },
+    ],
   },
   {
     executableOsId: 'win32',
-    compileBuildVariant: 'win32_build',
+    compileBuildVariant: 'build_win32',
     packages: [
-      { name: 'win32-x64', description: publicDescriptions.win32_x64, packageType: 'zip', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] },
-      { name: 'win32msi-x64', description: publicDescriptions.win32_x64, packageType: 'msi', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }
-    ]
-  }
+      {
+        name: 'win32-x64',
+        description: publicDescriptions.win32_x64,
+        packageType: 'zip',
+        packageOn: 'win32',
+        smokeTestKind: 'ssh',
+        serverLikeTargetList: ['windows'],
+      },
+      {
+        name: 'win32msi-x64',
+        description: publicDescriptions.win32_x64,
+        packageType: 'msi',
+        packageOn: 'win32',
+        smokeTestKind: 'ssh',
+        serverLikeTargetList: ['windows'],
+      },
+    ],
+  },
 ];