diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index 64d14dbbe7..67740146f7 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -11,7 +11,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "cron-linux-clang-rel-x64"
   }
 }
@@ -21,7 +21,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "linux-clang-dbg-x64"
   }
 }
@@ -31,7 +31,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "linux-clang-dbg-x86"
   }
 }
@@ -41,7 +41,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "linux-clang-rel-x64"
   }
 }
@@ -51,7 +51,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "linux-clang-rel-x86"
   }
 }
@@ -61,7 +61,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "mac-dbg"
   }
 }
@@ -71,7 +71,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "mac-rel"
   }
 }
@@ -81,7 +81,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "win-clang-dbg-x64"
   }
 }
@@ -91,7 +91,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "win-clang-dbg-x86"
   }
 }
@@ -101,7 +101,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "win-clang-rel-x64"
   }
 }
@@ -111,7 +111,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "win-clang-rel-x86"
   }
 }
@@ -121,7 +121,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "win-msvc-dbg-x64"
   }
 }
@@ -131,7 +131,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dawn.ci"
+    bucket: "ci"
     builder: "win-msvc-rel-x64"
   }
 }
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 79430cc3c6..06a9172621 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,8 +7,9 @@
 name: "dawn"
 access: "group:all"
 lucicfg {
-  version: "1.30.4"
+  version: "1.30.9"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
+  experiments: "crbug.com/1182002"
 }
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 32f59f8029..7331e9a502 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -8,6 +8,9 @@
 main.star: lucicfg configuration for Dawn's standalone builers.
 """
 
+# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
+lucicfg.enable_experiment("crbug.com/1182002")
+
 luci.builder.defaults.experiments.set({
     "luci.recipes.use_python3": 100,
 })