diff --git a/release/ray_release/buildkite/concurrency.py b/release/ray_release/buildkite/concurrency.py
index 8d0393604..d6c99e4c1 100644
--- a/release/ray_release/buildkite/concurrency.py
+++ b/release/ray_release/buildkite/concurrency.py
@@ -11,11 +11,12 @@ limit = int(15784 * 0.9)
 
 
 CONCURRENY_GROUPS = {
+    "tiny": 32,
     "small": 16,
     "medium": 4,
     "large": 2,
-    "small-gpu": 4,
-    "large-gpu": 2,
+    "small-gpu": 8,
+    "large-gpu": 4,
 }
 
 
@@ -24,10 +25,11 @@ Condition = namedtuple(
 )
 
 gpu_cpu_to_concurrency_groups = [
-    Condition(min_gpu=8, max_gpu=-1, min_cpu=0, max_cpu=-1, group="large-gpu"),
-    Condition(min_gpu=1, max_gpu=8, min_cpu=0, max_cpu=-1, group="small-gpu"),
-    Condition(min_gpu=0, max_gpu=0, min_cpu=512, max_cpu=-1, group="large"),
-    Condition(min_gpu=0, max_gpu=0, min_cpu=128, max_cpu=512, group="medium"),
+    Condition(min_gpu=9, max_gpu=-1, min_cpu=0, max_cpu=-1, group="large-gpu"),
+    Condition(min_gpu=1, max_gpu=9, min_cpu=0, max_cpu=-128, group="small-gpu"),
+    Condition(min_gpu=0, max_gpu=0, min_cpu=513, max_cpu=-1, group="large"),
+    Condition(min_gpu=0, max_gpu=0, min_cpu=129, max_cpu=512, group="medium"),
+    Condition(min_gpu=0, max_gpu=0, min_cpu=0, max_cpu=32, group="tiny"),
     Condition(min_gpu=0, max_gpu=0, min_cpu=0, max_cpu=128, group="small"),
 ]
 
diff --git a/release/ray_release/tests/test_buildkite.py b/release/ray_release/tests/test_buildkite.py
index bdef918e3..c955c2b15 100644
--- a/release/ray_release/tests/test_buildkite.py
+++ b/release/ray_release/tests/test_buildkite.py
@@ -328,12 +328,14 @@ class BuildkiteSettingsTest(unittest.TestCase):
                 self.assertEqual(group_name, group)
                 self.assertEqual(limit, CONCURRENY_GROUPS[group_name])
 
-        test_concurrency(12800, 8, "large-gpu")
-        test_concurrency(12800, 7, "small-gpu")
+        test_concurrency(12800, 9, "large-gpu")
+        test_concurrency(12800, 8, "small-gpu")
         test_concurrency(12800, 1, "small-gpu")
         test_concurrency(12800, 0, "large")
-        test_concurrency(512, 0, "large")
-        test_concurrency(511, 0, "medium")
-        test_concurrency(128, 0, "medium")
-        test_concurrency(127, 0, "small")
-        test_concurrency(1, 0, "small")
+        test_concurrency(513, 0, "large")
+        test_concurrency(512, 0, "medium")
+        test_concurrency(129, 0, "medium")
+        test_concurrency(128, 0, "small")
+        test_concurrency(1, 0, "tiny")
+        test_concurrency(32, 0, "tiny")
+        test_concurrency(33, 0, "small")