diff --git a/.evergreen.yml b/.evergreen.yml
index 3cd9f11e2..9ae59e486 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -5329,7 +5329,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5348,7 +5348,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5367,7 +5367,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5386,7 +5386,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5405,7 +5405,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5519,7 +5519,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5538,7 +5538,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -5557,7 +5557,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5576,7 +5576,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -5595,7 +5595,7 @@ tasks:
     tags: ["connectivity-test"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6033,7 +6033,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6116,7 +6116,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6199,7 +6199,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6282,7 +6282,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6365,7 +6365,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6448,7 +6448,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_x64
+        variant: build_linux_x64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -6780,7 +6780,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6863,7 +6863,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -6946,7 +6946,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl11
     commands:
       - func: checkout
       - func: install
@@ -7029,7 +7029,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -7112,7 +7112,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -7195,7 +7195,7 @@ tasks:
     tags: ["add-sbom-task"]
     depends_on:
       - name: compile_artifact
-        variant: build_linux_arm64
+        variant: build_linux_arm64_openssl3
     commands:
       - func: checkout
       - func: install
@@ -10920,37 +10920,37 @@ buildvariants:
     run_on: rhel8-power-small
     tags: []
     expansions:
-      executable_os_id: "linux-x64"
+      executable_os_id: "linux-ppc64le"
       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_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-x64"
+      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_x64
+      - 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-x64"
+      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_x64
+      - name: e2e_tests_linux_s390x
   - name: e2e_tests_macos_14
     display_name: "MacOS 14 x64 (E2E tests)"
     run_on: macos-14
diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js
index a73d76d1d..c44d090da 100644
--- a/.evergreen/build-variants/e2e-tests-build-variants.js
+++ b/.evergreen/build-variants/e2e-tests-build-variants.js
@@ -297,19 +297,19 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
   {
     displayName: "RHEL 8 PPC",
     runOn: "rhel8-power-small",
-    executableOsId: "linux-x64",
+    executableOsId: "linux-ppc64le",
     mVersion: "stable",
   },
   {
     displayName: "RHEL 7 s390x",
     runOn: "rhel7-zseries-large",
-    executableOsId: "linux-x64",
+    executableOsId: "linux-s390x",
     mVersion: "6.0.x",
   },
   {
     displayName: "RHEL 8 s390x",
     runOn: "rhel8-zseries-small",
-    executableOsId: "linux-x64",
+    executableOsId: "linux-s390x",
     mVersion: "stable",
   },
   {
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index 27ab343fe..a319c8c6b 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -88,8 +88,8 @@ for (const packageInfo of MONGOSH_PACKAGES) {
   });
 }
 
-const { E2E_TESTS_BUILD_VARIANTS } = require('./variants/e2e-tests-build-variants')
-const { COMPILE_BUILD_VARIANTS } = require('./variants/compile-build-variants')
+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')
 
 
diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js
index 21ffdc97b..e132d3525 100644
--- a/config/release-package-matrix.js
+++ b/config/release-package-matrix.js
@@ -135,7 +135,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
   },
   {
     executableOsId: 'linux-x64-openssl11',
-    compileBuildVariant: 'build_linux_x64',
+    compileBuildVariant: 'build_linux_x64_openssl11',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11],
     packages: [
       {
@@ -178,7 +178,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
   },
   {
     executableOsId: 'linux-x64-openssl3',
-    compileBuildVariant: 'build_linux_x64',
+    compileBuildVariant: 'build_linux_x64_openssl3',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL3],
     packages: [
       {
@@ -273,7 +273,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
   },
   {
     executableOsId: 'linux-arm64-openssl11',
-    compileBuildVariant: 'build_linux_arm64',
+    compileBuildVariant: 'build_linux_arm64_openssl11',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL11],
     packages: [
       {
@@ -315,7 +315,7 @@ exports.RELEASE_PACKAGE_MATRIX = [
   },
   {
     executableOsId: 'linux-arm64-openssl3',
-    compileBuildVariant: 'build_linux_arm64',
+    compileBuildVariant: 'build_linux_arm64_openssl3',
     kerberosConnectivityTestDockerfiles: [...krbConnTestsOpenSSL3],
     packages: [
       {