diff --git a/build/ci/evergreen.yml b/build/ci/evergreen.yml
index f13d28d2e0..ae215bce61 100644
--- a/build/ci/evergreen.yml
+++ b/build/ci/evergreen.yml
@@ -85,7 +85,7 @@ functions:
           <<: *go_options
         command: make integration-test
   "generate html coverage":
-    - command: subprocess.exec
+    - command: shell.exec
       type: test
       params:
         add_to_path:
@@ -93,7 +93,12 @@ functions:
         working_dir: src/github.com/mongodb/mongocli
         env:
           <<: *go_options
-        command: go tool cover -html=coverage.out -o coverage.html
+        script: |
+          set -Eeou pipefail
+
+          export GOROOT="${go_root}"
+          export PATH="./bin:$GOROOT/bin:$PATH"
+          go tool cover -html=coverage.out -o coverage.html  
   "upload html coverage":
     - command: s3.put
       params:
@@ -1118,7 +1123,7 @@ buildvariants:
   - name: code_health
     display_name: "Code Health"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1127,7 +1132,7 @@ buildvariants:
   - name: e2e_generic
     display_name: "E2E Tests Generic"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1136,7 +1141,7 @@ buildvariants:
   - name: e2e_atlas_clusters
     display_name: "E2E Atlas Cluster Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1145,7 +1150,7 @@ buildvariants:
   - name: e2e_atlas_gov_clusters
     display_name: "E2E Atlas Gov Cluster Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1154,7 +1159,7 @@ buildvariants:
   - name: e2e_atlas_networking
     display_name: "E2E Atlas Networking Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1163,7 +1168,7 @@ buildvariants:
   - name: e2e_atlas_live_migrations
     display_name: "E2E Atlas Live Migrations Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1172,7 +1177,7 @@ buildvariants:
   - name: e2e_atlas_datalake
     display_name: "E2E Atlas Datalake Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1181,7 +1186,7 @@ buildvariants:
   - name: e2e_cloud_manager_remote
     display_name: "E2E Cloud Manager Remote Host Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1190,7 +1195,7 @@ buildvariants:
   - name: e2e_ops_manager_44
     display_name: "E2E Ops Manager 4.4 Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1199,7 +1204,7 @@ buildvariants:
   - name: e2e_ops_manager_50
     display_name: "E2E Ops Manager 5.0 Tests"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
diff --git a/build/ci/release.yml b/build/ci/release.yml
index e012ae2b2a..284088799c 100644
--- a/build/ci/release.yml
+++ b/build/ci/release.yml
@@ -1271,7 +1271,7 @@ buildvariants:
   - name: publish_snapshot
     display_name: "Publish yum/apt main"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       go_root: "/opt/golang/go1.17"
       go_bin: "/opt/golang/go1.17/bin"
@@ -1279,7 +1279,7 @@ buildvariants:
     tasks:
       - name: .push
         run_on:
-          - rhel70-small
+          - rhel80-small
   - name: release_mongocli_msi
     display_name: "Release MongoCLI (go-msi)"
     run_on:
@@ -1321,7 +1321,7 @@ buildvariants:
   - name: release_mongocli_publish_42
     display_name: "Publish MongoCLI yum/apt 4.2"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       server_version: "4.2.3"
       notary_key_name: "server-4.2"
@@ -1330,7 +1330,7 @@ buildvariants:
   - name: release_mongocli_publish_44
     display_name: "Publish MongoCLI yum/apt 4.4"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       server_version: "4.4.3"
       notary_key_name: "server-4.4"
@@ -1339,7 +1339,7 @@ buildvariants:
   - name: release_mongocli_publish_50
     display_name: "Publish MongoCLI yum/apt 5.0"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       server_version: "5.0.0"
       notary_key_name: "server-5.0"
@@ -1348,7 +1348,7 @@ buildvariants:
   - name: release_atlascli_publish_42
     display_name: "Publish AtlasCLI yum/apt 4.2"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       server_version: "4.2.3"
       notary_key_name: "server-4.2"
@@ -1357,7 +1357,7 @@ buildvariants:
   - name: release_atlascli_publish_44
     display_name: "Publish AtlasCLI yum/apt 4.4"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       server_version: "4.4.3"
       notary_key_name: "server-4.4"
@@ -1366,7 +1366,7 @@ buildvariants:
   - name: release_atlascli_publish_50
     display_name: "Publish AtlasCLI yum/apt 5.0"
     run_on:
-      - rhel70-small
+      - rhel80-small
     expansions:
       server_version: "5.0.0"
       notary_key_name: "server-5.0"