diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 22354e03ca..47accfa19c 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -72,7 +72,7 @@ builder_mixins {
 }
 builder_mixins {
   name: "linux",
-  dimensions: "os:Ubuntu-16.04"
+  dimensions: "os:Ubuntu-18.04"
   recipe {
     properties_j: <<EOF
       $build/goma: {
@@ -265,7 +265,7 @@ buckets: {
 
     builders {
       name: "presubmit"
-      dimensions: "os:Ubuntu-16.04"
+      dimensions: "os:Ubuntu-18.04"
       recipe {
         name: "run_presubmit"
         properties: "repo_name:tint"