diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 8ae60ec6c..a2ea953f0 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see Config message:
-#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
+#   https://config.luci.app/schemas/projects:commit-queue.cfg
 
 cq_status_host: "chromium-cq-status.appspot.com"
 submit_options {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f8633f04d..c910bfe73 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see BuildbucketCfg message:
-#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
+#   https://config.luci.app/schemas/projects:buildbucket.cfg
 
 buckets {
   name: "ci"
@@ -1367,7 +1367,7 @@ buckets {
       name: "mac_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.flex.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -3307,7 +3307,7 @@ buckets {
       name: "mac_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Mac-11"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.flex.try"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
diff --git a/generated/luci-logdog.cfg b/generated/luci-logdog.cfg
index adc75bef4..01a391261 100644
--- a/generated/luci-logdog.cfg
+++ b/generated/luci-logdog.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
+#   https://config.luci.app/schemas/projects:luci-logdog.cfg
 
 reader_auth_groups: "all"
 writer_auth_groups: "luci-logdog-chromium-writers"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index cd8c41976..20cd864d4 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see Project message:
-#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
+#   https://config.luci.app/schemas/projects:luci-milo.cfg
 
 consoles {
   id: "main"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index aed41da8c..187da3461 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
+#   https://config.luci.app/schemas/projects:luci-notify.cfg
 
 notifiers {
   notifications {
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ea037dd9e..1f8c64afd 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
+#   https://config.luci.app/schemas/projects:luci-scheduler.cfg
 
 job {
   id: "android_aarch64"
diff --git a/generated/project.cfg b/generated/project.cfg
index b2e4c26db..b5864be4c 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -2,12 +2,12 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectCfg message:
-#   https://luci-config.appspot.com/schemas/projects:project.cfg
+#   https://config.luci.app/schemas/projects:project.cfg
 
 name: "boringssl"
 access: "group:all"
 lucicfg {
-  version: "1.39.8"
+  version: "1.40.0"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/generated/realms.cfg b/generated/realms.cfg
index e4b3864e7..920450f77 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see RealmsCfg message:
-#   https://luci-config.appspot.com/schemas/projects:realms.cfg
+#   https://config.luci.app/schemas/projects:realms.cfg
 
 realms {
   name: "@root"
diff --git a/main.star b/main.star
index 9d6423f00..b469310c0 100755
--- a/main.star
+++ b/main.star
@@ -243,7 +243,7 @@ LINUX_HOST = {
 
 MAC_ARM64_HOST = {
     "dimensions": {
-        "os": "Mac-11",
+        "os": "Mac",
         "cpu": "arm64",
     },
     "caches": [swarming.cache("osx_sdk")],