diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 0515d27eb6..9cf59667a0 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2357,11 +2357,6 @@ axes:
         run_on: ubuntu1804-build
         variables:
           GO_DIST: "/opt/golang/go1.20"
-      - id: "ubuntu2004-go-1-20"
-        display_name: "Ubuntu 20.04"
-        run_on: ubuntu2004-build
-        variables:
-          GO_DIST: "/opt/golang/go1.20"
       - id: "macos11-go-1-20"
         display_name: "MacOS 11.0"
         run_on: macos-1100
@@ -2414,6 +2409,15 @@ axes:
         variables:
           GO_DIST: "/opt/golang/go1.20"
 
+  - id: os-serverless
+    display_name: OS
+    values:
+      - id: "ubuntu2004-go-1-20"
+        display_name: "Ubuntu 20.04"
+        run_on: ubuntu2004-build
+        variables:
+          GO_DIST: "/opt/golang/go1.20"
+
 task_groups:
   - name: serverless_task_group
     setup_group_can_fail_task: true
@@ -2721,8 +2725,8 @@ buildvariants:
       - name: ".load-balancer"
 
   - matrix_name: "serverless"
-    matrix_spec: { os-ssl-40: ["ubuntu2004-go-1-20"] }
-    display_name: "Serverless ${os-ssl-40}"
+    matrix_spec: { os-serverless: "*" }
+    display_name: "Serverless ${os-serverless}"
     tasks:
       - "serverless_task_group"