diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index bf973f3..6d92824 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -98,6 +98,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -126,6 +127,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -154,6 +156,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -182,6 +185,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -210,6 +214,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -238,6 +243,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -266,6 +272,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -294,6 +301,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -322,6 +330,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -350,6 +359,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -378,6 +388,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -434,6 +445,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -462,6 +474,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -490,6 +503,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -546,6 +560,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -574,6 +589,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -602,6 +618,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -630,6 +647,7 @@
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 4
+    max_batch_size: 1
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 525fcd4..b87c601 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "r8"
 access: "group:all"
 lucicfg {
-  version: "1.30.4"
+  version: "1.30.5"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index a438dbc..02b45d5 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -173,6 +173,7 @@
       else ["main-gitiles-trigger"]
   triggering_policy = triggering_policy or scheduler.policy(
       kind = scheduler.GREEDY_BATCHING_KIND,
+      max_batch_size = 1 if release else None,
       max_concurrent_invocations = 4)
 
   luci.builder(