diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 3a4e486..54f656b 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -140,7 +140,7 @@
       name: "mac-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
+      dimensions: "os:Mac-11"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "dawn"
@@ -169,7 +169,7 @@
       name: "mac-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
+      dimensions: "os:Mac-11"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "dawn"
@@ -482,7 +482,7 @@
       name: "mac-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
+      dimensions: "os:Mac-11"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "dawn"
@@ -512,7 +512,7 @@
       name: "mac-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15"
+      dimensions: "os:Mac-11"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "dawn"
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 4d04895..79430cc 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dawn"
 access: "group:all"
 lucicfg {
-  version: "1.30.1"
+  version: "1.30.4"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 609d207..6224ff3 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -113,7 +113,7 @@
 
 os = struct(
     LINUX = os_enum("Ubuntu-18.04", os_category.LINUX, "linux"),
-    MAC = os_enum("Mac-10.15", os_category.MAC, "mac"),
+    MAC = os_enum("Mac-11", os_category.MAC, "mac"),
     WINDOWS = os_enum("Windows-10", os_category.WINDOWS, "win"),
 )