diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 663243a..9815e2b 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -14,7 +14,7 @@
       name: "linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "gn"
diff --git a/infra/config/main.star b/infra/config/main.star
index 876d20b..1357967 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -97,7 +97,7 @@
         short_name = name,
     )
 
-ci_builder("linux", "Ubuntu-16.04")
+ci_builder("linux", "Ubuntu-18.04")
 ci_builder("mac", "Mac-10.15", caches = [swarming.cache("macos_sdk")])
 ci_builder("win", "Windows-10", caches = [swarming.cache("windows_sdk")])