diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index f1fea2f673..ee6e973aea 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1877,11 +1877,9 @@ buildvariants:
 
   - matrix_name: "serverless"
     matrix_spec:
-      # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
+      ruby: "ruby-3.2"
       fle: path
-      os: rhel8
+      os: ubuntu2204
     display_name: "Atlas serverless ${ruby}"
     tasks:
        - name: serverless_task_group
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index c3c737f42c..571ec1245c 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -524,11 +524,9 @@ buildvariants:
 
   - matrix_name: "serverless"
     matrix_spec:
-      # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: <%= supported_rubies %>
-      ruby: <%= supported_mri_rubies %>
+      ruby: <%= latest_ruby %>
       fle: path
-      os: rhel8
+      os: ubuntu2204
     display_name: "Atlas serverless ${ruby}"
     tasks:
        - name: serverless_task_group
diff --git a/.evergreen/run-tests-serverless.sh b/.evergreen/run-tests-serverless.sh
index c34c1f5d94..e2447ba008 100755
--- a/.evergreen/run-tests-serverless.sh
+++ b/.evergreen/run-tests-serverless.sh
@@ -25,7 +25,7 @@ else
     python3 -u .evergreen/mongodl.py --component crypt_shared -V ${SERVERLESS_MONGODB_VERSION} --out `pwd`/csfle_lib  --target `host_distro` || true
     if test -f `pwd`/csfle_lib/lib/mongo_crypt_v1.so
     then
-        echo Usinn crypt shared library version ${SERVERLESS_MONGODB_VERSION}
+        echo Using crypt shared library version ${SERVERLESS_MONGODB_VERSION}
         export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=`pwd`/csfle_lib/lib/mongo_crypt_v1.so
     else
         echo Failed to download crypt shared library
@@ -33,8 +33,8 @@ else
     fi
 fi
 
-if ! ( test -f /etc/os-release & grep -q ^ID.*rhel /etc/os-release & grep -q ^VERSION_ID.*8.0 /etc/os-release ); then
-    echo Serverless tests assume rhel80
+if ! ( test -f /etc/os-release & grep -q ^ID.*ubuntu /etc/os-release & grep -q ^VERSION_ID.*22.04 /etc/os-release ); then
+    echo Serverless tests assume ubuntu2204
     echo If this has changed, update .evergreen/run-tests-serverless.sh as necessary
     exit -1
 fi
@@ -43,8 +43,8 @@ mkdir libmongocrypt
 cd libmongocrypt
 curl --retry 3 -fLo libmongocrypt-all.tar.gz "https://s3.amazonaws.com/mciuploads/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz"
 tar xf libmongocrypt-all.tar.gz
-# We assume that serverless tests always use rhel80
-export LIBMONGOCRYPT_PATH=`pwd`/rhel-80-64-bit/nocrypto/lib64/libmongocrypt.so
+# We assume that serverless tests always use ubuntu2204
+export LIBMONGOCRYPT_PATH=`pwd`/ubuntu2204-64/nocrypto/lib/libmongocrypt.so
 cd -
 
 cd .evergreen/csfle