diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index a9dc669718..14e3426b32 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2081,10 +2081,10 @@ axes:
         batchtime: 10080  # 7 days
       - id: rhel8
         display_name: "RHEL 8.x"
-        run_on: rhel87-small
+        run_on: rhel8.8-small
         batchtime: 10080  # 7 days
-      - id: rhel92-fips
-        display_name: "RHEL 9.2 FIPS"
+      - id: rhel9-fips
+        display_name: "RHEL 9 FIPS"
         run_on: rhel92-fips
         batchtime: 10080  # 7 days
       - id: ubuntu-22.04
@@ -2095,24 +2095,24 @@ axes:
         display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-small
         batchtime: 10080  # 7 days
-      - id: rhel83-zseries
-        display_name: "RHEL 8.3 (zSeries)"
-        run_on: rhel83-zseries-small
+      - id: rhel8-zseries
+        display_name: "RHEL 8 (zSeries)"
+        run_on: rhel8-zseries-small
         batchtime: 10080  # 7 days
         variables:
           SKIP_HATCH: true
-      - id: rhel81-power8
-        display_name: "RHEL 8.1 (POWER8)"
-        run_on: rhel81-power8-small
+      - id: rhel8-power8
+        display_name: "RHEL 8 (POWER8)"
+        run_on: rhel8-power-small
         batchtime: 10080  # 7 days
         variables:
           SKIP_HATCH: true
-      - id: rhel82-arm64
-        display_name: "RHEL 8.2 (ARM64)"
+      - id: rhel8-arm64
+        display_name: "RHEL 8 (ARM64)"
         run_on: rhel82-arm64-small
         batchtime: 10080  # 7 days
         variables:
-      - id: windows-64-vsMulti-small
+      - id: windows
         display_name: "Windows 64"
         run_on: windows-64-vsMulti-small
         batchtime: 10080  # 7 days
@@ -2470,7 +2470,7 @@ buildvariants:
 - matrix_name: "tests-fips"
   matrix_spec:
     platform:
-      - rhel92-fips
+      - rhel9-fips
     auth: "auth"
     ssl: "ssl"
   display_name: "${platform} ${auth} ${ssl}"
@@ -2547,9 +2547,9 @@ buildvariants:
 - matrix_name: "test-different-cpu-architectures"
   matrix_spec:
     platform:
-      - rhel83-zseries  # Added in 5.0.8 (SERVER-44074)
-      - rhel81-power8 # Added in 4.2.7 (SERVER-44072)
-      - rhel82-arm64 # Added in 4.4.2 (SERVER-48282)
+      - rhel8-zseries  # Added in 5.0.8 (SERVER-44074)
+      - rhel8-power8 # Added in 4.2.7 (SERVER-44072)
+      - rhel8-arm64 # Added in 4.4.2 (SERVER-48282)
     auth-ssl: "*"
   display_name: "${platform} ${auth-ssl}"
   tasks:
@@ -2606,7 +2606,7 @@ buildvariants:
 
 - matrix_name: "tests-pyopenssl-windows"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth: "auth"
     ssl: "ssl"
@@ -2698,7 +2698,7 @@ buildvariants:
 
 - matrix_name: "tests-windows-python-version"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth-ssl: "*"
   display_name: "${platform} ${python-version-windows} ${auth-ssl}"
@@ -2706,7 +2706,7 @@ buildvariants:
 
 - matrix_name: "tests-windows-python-version-32-bit"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows-32: "*"
     auth-ssl: "*"
   display_name: "${platform} ${python-version-windows-32} ${auth-ssl}"
@@ -2724,7 +2724,7 @@ buildvariants:
 
 - matrix_name: "tests-windows-encryption"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth-ssl: "*"
     encryption: "*"
@@ -2733,7 +2733,7 @@ buildvariants:
   rules:
     - if:
         encryption: ["encryption", "encryption_crypt_shared"]
-        platform: windows-64-vsMulti-small
+        platform: windows
         python-version-windows: "*"
         auth-ssl: "*"
       then:
@@ -2795,7 +2795,7 @@ buildvariants:
 
 - matrix_name: "tests-windows-enterprise-auth"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: "*"
     auth: "auth"
   display_name: "Enterprise ${auth} ${platform} ${python-version-windows}"
@@ -2907,7 +2907,7 @@ buildvariants:
 
 - matrix_name: "ocsp-test-windows"
   matrix_spec:
-    platform: windows-64-vsMulti-small
+    platform: windows
     python-version-windows: ["3.8", "3.10"]
     mongodb-version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"]
     auth: "noauth"
@@ -2932,7 +2932,7 @@ buildvariants:
 
 - matrix_name: "oidc-auth-test"
   matrix_spec:
-    platform: [ rhel8, macos, windows-64-vsMulti-small ]
+    platform: [ rhel8, macos, windows ]
   display_name: "OIDC Auth ${platform}"
   tasks:
     - name: testoidc_task_group
@@ -2981,7 +2981,7 @@ buildvariants:
 
 - matrix_name: "aws-auth-test-windows"
   matrix_spec:
-    platform: [windows-64-vsMulti-small]
+    platform: [windows]
     python-version-windows: "*"
   display_name: "MONGODB-AWS Auth ${platform} ${python-version-windows}"
   tasks: