diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml
index 33f66627cf3..c8e742c289d 100644
--- a/.evergreen/buildvariants-and-tasks.in.yml
+++ b/.evergreen/buildvariants-and-tasks.in.yml
@@ -110,8 +110,8 @@ const MAINTAINED_SERVER_VERSIONS = [
   { name: '60x-enterprise', version: '6.0.x-enterprise' },
   { name: '70x-community', version: '7.0.x' },
   { name: '70x-enterprise', version: '7.0.x-enterprise' },
-  { name: '80x-community', version: '8.0.0-rc18' },
-  { name: '80x-enterprise', version: '8.0.0-rc18-enterprise' },
+  { name: '80x-community', version: '8.0.x' },
+  { name: '80x-enterprise', version: '8.0.x-enterprise' },
 ];
 
 const TEST_LATEST_ALPHA_SERVER_VERSION = { name: 'latest-alpha', version: 'latest-alpha-enterprise' };
@@ -281,7 +281,7 @@ tasks:
       - func: check
 
   - name: test
-    tags: 
+    tags:
       - required-for-publish
       - run-on-pr
       - assigned_to_jira_team_compass_compass
diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml
index 9db333b07a0..8c3aa4df9f3 100644
--- a/.evergreen/buildvariants-and-tasks.yml
+++ b/.evergreen/buildvariants-and-tasks.yml
@@ -1291,7 +1291,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 8.0.0-rc18
+          mongodb_version: 8.0.x
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 1
@@ -1314,7 +1314,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 8.0.0-rc18
+          mongodb_version: 8.0.x
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 2
@@ -1337,7 +1337,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 8.0.0-rc18
+          mongodb_version: 8.0.x
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 3
@@ -1360,7 +1360,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 8.0.0-rc18-enterprise
+          mongodb_version: 8.0.x-enterprise
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 1
@@ -1383,7 +1383,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 8.0.0-rc18-enterprise
+          mongodb_version: 8.0.x-enterprise
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 2
@@ -1406,7 +1406,7 @@ tasks:
           compass_distribution: compass
       - func: test-packaged-app
         vars:
-          mongodb_version: 8.0.0-rc18-enterprise
+          mongodb_version: 8.0.x-enterprise
           compass_distribution: compass
           e2e_test_groups: 3
           e2e_test_group: 3
diff --git a/.evergreen/functions.yml b/.evergreen/functions.yml
index bf77d055ee8..68b4dd24be7 100644
--- a/.evergreen/functions.yml
+++ b/.evergreen/functions.yml
@@ -699,7 +699,7 @@ functions:
           eval $(.evergreen/print-compass-env.sh)
           rm -rf mongodb-crypt && mkdir -p mongodb-crypt
           (cd mongodb-crypt && \
-            curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 8.0.0-rc18') | \
+            curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version continuous) | \
             tar -xvz)
           export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
           npm run test-csfle --workspace mongodb-data-service
diff --git a/packages/compass/scripts/download-csfle.js b/packages/compass/scripts/download-csfle.js
index 366c9644d26..57ffa43ffce 100644
--- a/packages/compass/scripts/download-csfle.js
+++ b/packages/compass/scripts/download-csfle.js
@@ -35,9 +35,7 @@ const CSFLE_DIRECTORY = path.resolve(PACKAGE_ROOT, 'src', 'deps', 'csfle');
   const downloadOptions = {
     enterprise: true,
     crypt_shared: true,
-    // TODO(MONGOSH-1833): The current 'continuous' release is not compatible with 8.x rc server releases. So we are using
-    // 8.0.0-rc18 (current latest) for now and once 8.0 is released we should switch back to continuous.
-    version: '8.0.0-rc18',
+    version: 'continuous',
   };
   if (process.platform === 'linux') {
     // The CSFLE shared library is built for different distros,
@@ -49,7 +47,7 @@ const CSFLE_DIRECTORY = path.resolve(PACKAGE_ROOT, 'src', 'deps', 'csfle');
 
   const { downloadedBinDir, version } = await downloadMongoDbWithVersionInfo(
     CACHE_DIR,
-    '8.0.0-rc18',
+    'continuous',
     downloadOptions
   );
   await fs.mkdir(CSFLE_DIRECTORY, { recursive: true });