diff --git a/.evergreen.yml b/.evergreen.yml
index ad957b913..31c083a33 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -17370,7 +17370,7 @@ buildvariants:
     tasks:
       - name: e2e_tests_linux_arm64
       - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel81_ppc64le
+  - name: e2e_rhel8_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
     run_on: rhel8-power-small
     tasks:
@@ -17750,7 +17750,7 @@ buildvariants:
     run_on: rhel8-zseries-small
     tasks:
       - name: pkg_test_rpmextract_rpm_s390x
-  - name: pkg_smoke_tests_rhel81_ppc64le
+  - name: pkg_smoke_tests_rhel8_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
     run_on: rhel8-power-small
     tasks:
diff --git a/.evergreen/compilation-context-expansions.sh b/.evergreen/compilation-context-expansions.sh
index 60a0f2c2c..592625855 100644
--- a/.evergreen/compilation-context-expansions.sh
+++ b/.evergreen/compilation-context-expansions.sh
@@ -1,4 +1,4 @@
-export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel81-power8|amazon2-arm64|macos)"
+export DISTRO_UPLOADLIST_REGEX="^(rhel70|win|rhel7-zseries|rhel8-power|amazon2-arm64|macos)"
 export COMPILING_CONTEXT_FILE="$(pwd)/../tmp/compiling-context.yml"
 
 if ! [[ "$DISTRO_ID" =~ $DISTRO_UPLOADLIST_REGEX ]]; then
diff --git a/.evergreen/compilation-context-expansions.test.sh b/.evergreen/compilation-context-expansions.test.sh
index 248b4e29a..ebaba1284 100755
--- a/.evergreen/compilation-context-expansions.test.sh
+++ b/.evergreen/compilation-context-expansions.test.sh
@@ -31,7 +31,8 @@ rhel7-zseries-large=true
 rhel7-zseries-small=true
 rhel76-large=false
 rhel80-small=false
-rhel81-power8-small=true
+rhel81-power8-small=false
+rhel8-power-small=true
 rhel82-arm64-small=false
 rhel83-fips=false
 rhel83-zseries-small=false
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index 2920e8a79..ae96b4da0 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -1863,7 +1863,7 @@ buildvariants:
     tasks:
       - name: e2e_tests_linux_arm64
       - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_rhel81_ppc64le
+  - name: e2e_rhel8_ppc64le
     display_name: "RHEL 8 PPC (E2E Tests)"
     run_on: rhel8-power-small
     tasks:
@@ -2015,7 +2015,7 @@ buildvariants:
     run_on: rhel8-zseries-small
     tasks:
       - name: pkg_test_rpmextract_rpm_s390x
-  - name: pkg_smoke_tests_rhel81_ppc64le
+  - name: pkg_smoke_tests_rhel8_ppc64le
     display_name: "package smoke tests (RHEL 8 ppc64le)"
     run_on: rhel8-power-small
     tasks: