diff --git a/.evergreen.yml b/.evergreen.yml
index 8f5f8e763..2595605b6 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -8531,7 +8531,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n20_cli_repl"
@@ -8548,7 +8548,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n20_cli_repl"
@@ -8752,7 +8752,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n16_cli_repl"
@@ -8769,7 +8769,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n16_cli_repl"
@@ -9007,7 +9007,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n20_e2e_tests"
@@ -9024,7 +9024,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n20_e2e_tests"
@@ -9228,7 +9228,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n16_e2e_tests"
@@ -9245,7 +9245,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n16_e2e_tests"
@@ -9585,7 +9585,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n20_java_shell"
@@ -9602,7 +9602,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n20_java_shell"
@@ -9806,7 +9806,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n16_java_shell"
@@ -9823,7 +9823,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n16_java_shell"
@@ -10095,7 +10095,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n20_mongosh"
@@ -10112,7 +10112,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n20_mongosh"
@@ -10316,7 +10316,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n16_mongosh"
@@ -10333,7 +10333,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n16_mongosh"
@@ -10537,7 +10537,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n20_node_runtime_worker_thread"
@@ -10554,7 +10554,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n20_node_runtime_worker_thread"
@@ -10758,7 +10758,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n16_node_runtime_worker_thread"
@@ -10775,7 +10775,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n16_node_runtime_worker_thread"
@@ -11013,7 +11013,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n20_service_provider_server"
@@ -11030,7 +11030,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n20_service_provider_server"
@@ -11234,7 +11234,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n16_service_provider_server"
@@ -11251,7 +11251,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n16_service_provider_server"
@@ -11455,7 +11455,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n20_shell_api"
@@ -11472,7 +11472,7 @@ tasks:
           node_js_version: "20.17.0"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "20.17.0"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n20_shell_api"
@@ -11676,7 +11676,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17"
+          mongosh_server_test_version: "8.0.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xc_n16_shell_api"
@@ -11693,7 +11693,7 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          mongosh_server_test_version: "8.0.x-enterprise"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
           mongosh_test_id: "m80xe_n16_shell_api"
@@ -11936,7 +11936,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_darwin_x64_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -11952,10 +11952,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_darwin_x64_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -11971,7 +11971,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12064,7 +12064,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_darwin_arm64_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12080,10 +12080,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_darwin_arm64_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12099,7 +12099,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12192,7 +12192,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_x64_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12208,10 +12208,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_x64_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12227,7 +12227,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12320,7 +12320,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_x64_openssl11_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12336,10 +12336,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_x64_openssl11_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12355,7 +12355,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12448,7 +12448,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_x64_openssl3_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12464,10 +12464,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_x64_openssl3_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12483,7 +12483,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12576,7 +12576,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_arm64_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12592,10 +12592,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_arm64_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12611,7 +12611,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12704,7 +12704,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_arm64_openssl11_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12720,10 +12720,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_arm64_openssl11_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12739,7 +12739,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12832,7 +12832,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_arm64_openssl3_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12848,10 +12848,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_arm64_openssl3_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12867,7 +12867,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -12960,7 +12960,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_ppc64le_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12976,10 +12976,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_ppc64le_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -12995,7 +12995,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -13088,7 +13088,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_linux_s390x_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -13104,10 +13104,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_linux_s390x_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -13123,7 +13123,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -13216,7 +13216,7 @@ tasks:
           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_800rc17_fips
+  - name: e2e_tests_win32_70x_fips
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -13232,10 +13232,10 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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_800rc17
+  - name: e2e_tests_win32_70x
     tags: ["e2e-test"]
     depends_on:
       - name: compile_artifact
@@ -13251,7 +13251,7 @@ tasks:
       - func: run_e2e_tests
         vars:
           node_js_version: "20.17.0"
-          mongosh_server_test_version: "8.0.0-rc17-enterprise"
+          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
@@ -17794,13 +17794,13 @@ buildvariants:
     run_on: rhel70-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - 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
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_rhel80_x64
     display_name: "RHEL 8.0 x64 (E2E Tests)"
     run_on: rhel80-small
@@ -17813,6 +17813,14 @@ buildvariants:
     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
@@ -17823,9 +17831,9 @@ buildvariants:
       - name: e2e_tests_linux_x64
       - name: e2e_tests_linux_x64_openssl11
       - name: e2e_tests_linux_x64_openssl11_fips
-  - name: e2e_rhel92_x64
-    display_name: "RHEL 9.2 x64 (E2E Tests, FIPS-available OS)"
-    run_on: rhel92-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
@@ -17856,8 +17864,8 @@ buildvariants:
     run_on: ubuntu2404-small
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64_800rc17
-      - name: e2e_tests_linux_x64_openssl3_800rc17
+      - 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
@@ -17870,14 +17878,14 @@ buildvariants:
     run_on: debian11-small
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl11
+      - 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
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_amazon2023_x64
     display_name: "Amazon Linux 2023 x64 (E2E Tests)"
     run_on: amazon2023.0-small
@@ -17891,7 +17899,7 @@ buildvariants:
     run_on: suse12-sp5-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_suse15_x64
     display_name: "SLES 15 x64 (E2E Tests)"
     run_on: suse15sp4-small
@@ -17919,13 +17927,13 @@ buildvariants:
     display_name: "Ubuntu 24.04 arm64 (E2E Tests)"
     run_on: ubuntu2404-arm64-small
     tasks:
-      - name: e2e_tests_linux_arm64_800rc17
-      - name: e2e_tests_linux_arm64_openssl3_800rc17
+      - 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
+      - name: e2e_tests_linux_arm64_70x
   - name: e2e_amazon2023_arm64
     display_name: "Amazon Linux 2023 arm64 (E2E Tests)"
     run_on: amazon2023.0-arm64-small
@@ -17941,6 +17949,14 @@ buildvariants:
   - 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:
diff --git a/.evergreen/compilation-context-expansions.test.sh b/.evergreen/compilation-context-expansions.test.sh
index b9f978893..aee28bd33 100755
--- a/.evergreen/compilation-context-expansions.test.sh
+++ b/.evergreen/compilation-context-expansions.test.sh
@@ -35,7 +35,7 @@ rhel83-fips=false
 rhel83-zseries-small=false
 rhel90-arm64-small=false
 rhel90-small=false
-rhel92-fips=false
+rhel93-fips=false
 suse12-sp5-large=false
 suse15sp4-small=false
 ubuntu1804-arm64-large=false
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index bf834d4fa..4b4d1d58b 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -15,8 +15,8 @@ const MONGODB_VERSIONS = [
   { shortName: '60xe', versionSpec: '6.0.x-enterprise' },
   { shortName: '70xc', versionSpec: '7.0.x' },
   { shortName: '70xe', versionSpec: '7.0.x-enterprise' },
-  { shortName: '80xc', versionSpec: '8.0.0-rc17' },
-  { shortName: '80xe', versionSpec: '8.0.0-rc17-enterprise' },
+  { shortName: '80xc', versionSpec: '8.0.x' },
+  { shortName: '80xe', versionSpec: '8.0.x-enterprise' },
   { shortName: 'latest', versionSpec: 'latest-alpha-enterprise' }
 ];
 const NODE_VERSIONS = [
@@ -1204,7 +1204,7 @@ tasks:
   # E2E TESTS
   ###
   <% for (const { executableOsId, compileBuildVariant } of RELEASE_PACKAGE_MATRIX) {
-    for (const mVersion of ['stable', '8.0.0-rc17', '6.0.x']) {
+    for (const mVersion of ['stable', '7.0.x', '6.0.x']) {
       for (const fipsVariant of ['fips', 'nofips']) {
     %>
   - name: e2e_tests_<% out(executableOsId.replace(/-/g, '_')) %><% out(mVersion === 'stable' ? '' : '_' + mVersion.replace(/[^a-zA-Z0-9]/g, '')) %><% out(fipsVariant === 'fips' ? '_fips' : '') %>
@@ -1682,13 +1682,13 @@ buildvariants:
     run_on: rhel70-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - 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
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_rhel80_x64
     display_name: "RHEL 8.0 x64 (E2E Tests)"
     run_on: rhel80-small
@@ -1701,6 +1701,14 @@ buildvariants:
     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
@@ -1711,9 +1719,9 @@ buildvariants:
       - name: e2e_tests_linux_x64
       - name: e2e_tests_linux_x64_openssl11
       - name: e2e_tests_linux_x64_openssl11_fips
-  - name: e2e_rhel92_x64
-    display_name: "RHEL 9.2 x64 (E2E Tests, FIPS-available OS)"
-    run_on: rhel92-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
@@ -1744,8 +1752,8 @@ buildvariants:
     run_on: ubuntu2404-small
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64_800rc17
-      - name: e2e_tests_linux_x64_openssl3_800rc17
+      - 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
@@ -1758,14 +1766,14 @@ buildvariants:
     run_on: debian11-small
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
-      - name: e2e_tests_linux_x64_openssl11
+      - 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
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_amazon2023_x64
     display_name: "Amazon Linux 2023 x64 (E2E Tests)"
     run_on: amazon2023.0-small
@@ -1779,7 +1787,7 @@ buildvariants:
     run_on: suse12-sp5-large
     tags: ["nightly-driver"]
     tasks:
-      - name: e2e_tests_linux_x64
+      - name: e2e_tests_linux_x64_70x
   - name: e2e_suse15_x64
     display_name: "SLES 15 x64 (E2E Tests)"
     run_on: suse15sp4-small
@@ -1807,13 +1815,13 @@ buildvariants:
     display_name: "Ubuntu 24.04 arm64 (E2E Tests)"
     run_on: ubuntu2404-arm64-small
     tasks:
-      - name: e2e_tests_linux_arm64_800rc17
-      - name: e2e_tests_linux_arm64_openssl3_800rc17
+      - 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
+      - name: e2e_tests_linux_arm64_70x
   - name: e2e_amazon2023_arm64
     display_name: "Amazon Linux 2023 arm64 (E2E Tests)"
     run_on: amazon2023.0-arm64-small
@@ -1829,6 +1837,14 @@ buildvariants:
   - 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:
diff --git a/packages/build/src/packaging/download-crypt-library.ts b/packages/build/src/packaging/download-crypt-library.ts
index 4c582d927..43cfec93a 100644
--- a/packages/build/src/packaging/download-crypt-library.ts
+++ b/packages/build/src/packaging/download-crypt-library.ts
@@ -34,12 +34,10 @@ export async function downloadCryptLibrary(
   );
   // Download mongodb for latest server version, including rapid releases
   // (for the platforms that they exist for, i.e. for ppc64le/s390x only pick stable releases).
-  // TODO(MONGOSH-1833): The current 'continuous' release is not compatible with 8.x rc server releases. So we are using
-  // 8.0.0-rc17 (current latest) for now and once 8.0 is released we should switch back to continuous.
-  const versionSpec = '8.0.0-rc17';
-  //if (/ppc64|s390x/.test(opts.arch || process.arch)) {
-  //  versionSpec = 'stable';
-  //}
+  let versionSpec = 'continuous';
+  if (/ppc64|s390x/.test(opts.arch || process.arch)) {
+    versionSpec = 'stable';
+  }
   const { downloadedBinDir: libdir, version } =
     await downloadMongoDbWithVersionInfo(cryptTmpTargetDir, versionSpec, opts);
   const cryptLibrary = path.join(
diff --git a/packages/e2e-tests/test/e2e-auth.spec.ts b/packages/e2e-tests/test/e2e-auth.spec.ts
index 4e01d2972..f9fdc52a2 100644
--- a/packages/e2e-tests/test/e2e-auth.spec.ts
+++ b/packages/e2e-tests/test/e2e-auth.spec.ts
@@ -173,7 +173,7 @@ describe('Auth e2e', function () {
         it('digestPassword', async function () {
           if (
             process.env.MONGOSH_TEST_E2E_FORCE_FIPS ||
-            process.env.DISTRO_ID === 'rhel92-fips'
+            process.env.DISTRO_ID === 'rhel93-fips'
           ) {
             return this.skip(); // No SCRAM-SHA-1 in FIPS mode
           }
@@ -239,7 +239,7 @@ describe('Auth e2e', function () {
         it('digestPassword', async function () {
           if (
             process.env.MONGOSH_TEST_E2E_FORCE_FIPS ||
-            process.env.DISTRO_ID === 'rhel92-fips'
+            process.env.DISTRO_ID === 'rhel93-fips'
           ) {
             return this.skip(); // No SCRAM-SHA-1 in FIPS mode
           }
@@ -960,7 +960,7 @@ describe('Auth e2e', function () {
       it('can auth with SCRAM-SHA-1', async function () {
         if (
           process.env.MONGOSH_TEST_E2E_FORCE_FIPS ||
-          process.env.DISTRO_ID === 'rhel92-fips'
+          process.env.DISTRO_ID === 'rhel93-fips'
         ) {
           return this.skip(); // No SCRAM-SHA-1 in FIPS mode
         }
diff --git a/packages/e2e-tests/test/e2e-snippet.spec.ts b/packages/e2e-tests/test/e2e-snippet.spec.ts
index 2fa7136be..3b1c329ed 100644
--- a/packages/e2e-tests/test/e2e-snippet.spec.ts
+++ b/packages/e2e-tests/test/e2e-snippet.spec.ts
@@ -12,9 +12,9 @@ describe('snippet integration tests', function () {
   let shell: TestShell;
   let makeTestShell: () => TestShell;
   beforeEach(async function () {
-    if (process.env.DISTRO_ID === 'rhel92-fips') {
+    if (process.env.DISTRO_ID === 'rhel93-fips') {
       // TODO: The HTTPS requests we are making for snippet support do not work
-      // with the FIPS configuration on the RHEL 9.2 FIPS-enabled machines.
+      // with the FIPS configuration on the RHEL 9.3 FIPS-enabled machines.
       return this.skip();
     }