diff --git a/tools/OWNERS_INFRA b/tools/OWNERS_INFRA
index dedb68b9ce9..e82f681eaad 100644
--- a/tools/OWNERS_INFRA
+++ b/tools/OWNERS_INFRA
@@ -1 +1,2 @@
 athom@google.com
+rmacnak@google.com
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 851040962b6..5664b978800 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -3203,14 +3203,29 @@
           ]
         },
         {
-          "name": "build dart - step 1 - divided to avoid timeout",
+          "name": "build dart - step 1 - gen-snapshot - divided to avoid timeout",
+          "script": "tools/build.py",
+          "arguments": [
+            "gen_snapshot"
+          ]
+        },
+        {
+          "name": "build dart - step 2 - runtime/bin:dart - divided to avoid timeout",
+          "script": "tools/build.py",
+          "arguments": [
+            "runtime/bin:dart",
+            "runtime/bin:run_vm_tests"
+          ]
+        },
+        {
+          "name": "build dart - step 3 - runtime - divided to avoid timeout",
           "script": "tools/build.py",
           "arguments": [
             "runtime"
           ]
         },
         {
-          "name": "build dart - step 2 - divided to avoid timeout",
+          "name": "build dart - step 4 - sdk, ddc_stable_test - divided to avoid timeout",
           "script": "tools/build.py",
           "arguments": [
             "create_sdk",