diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml
index 1eb7d30eac1..f356112ccce 100644
--- a/.evergreen/buildvariants-and-tasks.in.yml
+++ b/.evergreen/buildvariants-and-tasks.in.yml
@@ -27,11 +27,7 @@ const PACKAGE_BUILD_VARIANTS = [
   {
     name: 'package-ubuntu',
     display_name: 'Package Ubuntu',
-
-    // # NOTE: We are packaging on Ubuntu 18.04 in order to use glibc 2.27
-    // # when compiling/re-building addons. This ensures compatibility with other
-    // # debian platforms that have glibc 2.27 or newer.
-    run_on: 'ubuntu1804-large',
+    run_on: 'ubuntu2004-large',
     target_platform: 'ubuntu',
   },
   {
diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml
index e11225e34b9..5caa7af7ec4 100644
--- a/.evergreen/buildvariants-and-tasks.yml
+++ b/.evergreen/buildvariants-and-tasks.yml
@@ -35,7 +35,7 @@ buildvariants:
     expansions:
       target_platform: ubuntu
     display_name: Package Ubuntu
-    run_on: ubuntu1804-large
+    run_on: ubuntu2004-large
     tasks:
       - name: package-compass
       - name: package-compass-isolated