diff --git a/config/generated/ci_yaml/packages_config.json b/config/generated/ci_yaml/packages_config.json
index 10ddfa5..3f73748 100644
--- a/config/generated/ci_yaml/packages_config.json
+++ b/config/generated/ci_yaml/packages_config.json
@@ -1 +1 @@
-{"targets":[{"name":"Windows custom_package_tests master - packages","timeout":30,"properties":{"add_recipes_cq":"true","target_file":"windows_custom_package_tests.yaml","channel":"master","version_file":"flutter_master.version","dependencies":"[\n  {\"dependency\": \"vs_build\", \"version\": \"version:vs2019\"}\n]\n"},"recipe":"packages/packages"},{"name":"Windows dart_unit_tests master - packages","timeout":30,"properties":{"add_recipes_cq":"true","target_file":"windows_dart_unit_tests.yaml","channel":"master","version_file":"flutter_master.version","dependencies":"[\n  {\"dependency\": \"vs_build\", \"version\": \"version:vs2019\"}\n]\n"},"recipe":"packages/packages"},{"name":"Windows win32-platform_tests master - packages","timeout":30,"properties":{"add_recipes_cq":"true","target_file":"windows_build_and_platform_tests.yaml","channel":"master","version_file":"flutter_master.version","dependencies":"[\n  {\"dependency\": \"vs_build\", \"version\": \"version:vs2019\"}\n]\n"},"recipe":"packages/packages"},{"name":"Windows win32-platform_tests stable - packages","timeout":30,"properties":{"add_recipes_cq":"true","target_file":"windows_build_and_platform_tests.yaml","channel":"stable","version_file":"flutter_stable.version","dependencies":"[\n  {\"dependency\": \"vs_build\", \"version\": \"version:vs2019\"}\n]\n"},"recipe":"packages/packages"},{"name":"Linux ci_yaml packages roller","recipe":"infra/ci_yaml"}],"enabledBranches":["main"],"platformProperties":{"linux":{"properties":{"os":"Linux"}},"windows":{"properties":{"dependencies":"[\n  {\"dependency\": \"certs\", \"version\": \"version:9563bb\"}\n]\n","device_type":"none","os":"Windows"}}}}
+{"targets":[{"name":"Windows win32-platform_tests master - packages","bringup":true,"timeout":30,"properties":{"add_recipes_cq":"true","target_file":"windows_build_and_platform_tests.yaml","channel":"master","dependencies":"[\n  {\"dependency\": \"vs_build\"}\n]\n"},"scheduler":"luci","recipe":"packages/packages"},{"name":"Windows win32-platform_tests stable - packages","bringup":true,"timeout":30,"properties":{"add_recipes_cq":"true","target_file":"windows_build_and_platform_tests.yaml","channel":"stable","dependencies":"[\n  {\"dependency\": \"vs_build\"}\n]\n"},"scheduler":"luci","recipe":"packages/packages"},{"name":"Linux fuchsia_ctl","timeout":90,"properties":{"add_recipes_cq":"true"},"scheduler":"luci","postsubmit":false,"recipe":"fuchsia_ctl"},{"name":"Linux ci_yaml packages roller","scheduler":"luci","recipe":"infra/ci_yaml"}],"enabledBranches":["main","master"],"platformProperties":{"linux":{"properties":{"fuchsia_ctl_version":"","os":"Linux"}},"windows":{"properties":{"caches":"[\n  {\"name\": \"vsbuild\", \"path\": \"vsbuild\"},\n  {\"name\": \"pub_cache\", \"path\": \".pub-cache\"}\n]","dependencies":"[\n  {\"dependency\": \"certs\"}\n]\n","device_type":"none","os":"Windows"}}}}
diff --git a/config/generated/flutter/luci/commit-queue.cfg b/config/generated/flutter/luci/commit-queue.cfg
index 470bdbe..cb709ef 100644
--- a/config/generated/flutter/luci/commit-queue.cfg
+++ b/config/generated/flutter/luci/commit-queue.cfg
@@ -303,10 +303,7 @@
     }
     tryjob {
       builders {
-        name: "flutter/try/Windows custom_package_tests master - packages"
-      }
-      builders {
-        name: "flutter/try/Windows dart_unit_tests master - packages"
+        name: "flutter/try/Linux fuchsia_ctl"
       }
       builders {
         name: "flutter/try/Windows win32-platform_tests master - packages"
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index a8adfb8..73b714f 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -9144,6 +9144,7 @@
         '  "bringup": false,'
         '  "clobber": false,'
         '  "dependencies": [],'
+        '  "fuchsia_ctl_version": "",'
         '  "git_branch": "main",'
         '  "git_repo": "packages",'
         '  "gold_tryjob": false,'
@@ -10316,6 +10317,62 @@
       }
     }
     builders {
+      name: "Linux fuchsia_ctl"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.flutter.prod"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$fuchsia/goma": {'
+        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+        '  },'
+        '  "$kitchen": {'
+        '    "emulate_gce": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "add_recipes_cq": true,'
+        '  "bringup": false,'
+        '  "clobber": false,'
+        '  "dependencies": [],'
+        '  "fuchsia_ctl_version": "",'
+        '  "git_branch": "main",'
+        '  "git_repo": "packages",'
+        '  "gold_tryjob": false,'
+        '  "goma_jobs": "200",'
+        '  "mastername": "client.flutter",'
+        '  "os": "Linux",'
+        '  "recipe": "fuchsia_ctl",'
+        '  "upload_packages": true'
+        '}'
+      priority: 30
+      execution_timeout_secs: 16200
+      caches {
+        name: "packages_main_builder"
+        path: "builder"
+      }
+      caches {
+        name: "pub_cache"
+        path: ".pub-cache"
+      }
+      build_numbers: YES
+      service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Linux fuchsia_f5 Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "os:Linux"
@@ -90745,83 +90802,6 @@
       }
     }
     builders {
-      name: "Windows custom_package_tests master - packages"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.flutter.prod"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "add_recipes_cq": true,'
-        '  "bringup": false,'
-        '  "channel": "master",'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
-        '    },'
-        '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "git_branch": "main",'
-        '  "git_repo": "packages",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "os": "Windows",'
-        '  "recipe": "packages/packages",'
-        '  "target_file": "windows_custom_package_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 5400
-      caches {
-        name: "packages_main_builder"
-        path: "builder"
-      }
-      caches {
-        name: "packages_main_certs_version_9563bb"
-        path: "certs"
-      }
-      caches {
-        name: "packages_main_vs_build_version_vs2019"
-        path: "vs_build"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      build_numbers: YES
-      service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows customer_testing"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -90895,83 +90875,6 @@
       }
     }
     builders {
-      name: "Windows dart_unit_tests master - packages"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.flutter.prod"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "add_recipes_cq": true,'
-        '  "bringup": false,'
-        '  "channel": "master",'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
-        '    },'
-        '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "git_branch": "main",'
-        '  "git_repo": "packages",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "os": "Windows",'
-        '  "recipe": "packages/packages",'
-        '  "target_file": "windows_dart_unit_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 5400
-      caches {
-        name: "packages_main_builder"
-        path: "builder"
-      }
-      caches {
-        name: "packages_main_certs_version_9563bb"
-        path: "certs"
-      }
-      caches {
-        name: "packages_main_vs_build_version_vs2019"
-        path: "vs_build"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      build_numbers: YES
-      service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows device_doctor"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "os:Windows"
@@ -96783,17 +96686,15 @@
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "add_recipes_cq": true,'
-        '  "bringup": false,'
+        '  "bringup": true,'
         '  "channel": "master",'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
+        '      "dependency": "vs_build"'
         '    },'
         '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
+        '      "dependency": "certs"'
         '    }'
         '  ],'
         '  "device_type": "none",'
@@ -96805,8 +96706,7 @@
         '  "os": "Windows",'
         '  "recipe": "packages/packages",'
         '  "target_file": "windows_build_and_platform_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
+        '  "upload_packages": true'
         '}'
       priority: 30
       execution_timeout_secs: 5400
@@ -96815,11 +96715,11 @@
         path: "builder"
       }
       caches {
-        name: "packages_main_certs_version_9563bb"
+        name: "packages_main_certs_default"
         path: "certs"
       }
       caches {
-        name: "packages_main_vs_build_version_vs2019"
+        name: "packages_main_vs_build_default"
         path: "vs_build"
       }
       caches {
@@ -96937,17 +96837,15 @@
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "add_recipes_cq": true,'
-        '  "bringup": false,'
+        '  "bringup": true,'
         '  "channel": "stable",'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
+        '      "dependency": "vs_build"'
         '    },'
         '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
+        '      "dependency": "certs"'
         '    }'
         '  ],'
         '  "device_type": "none",'
@@ -96959,8 +96857,7 @@
         '  "os": "Windows",'
         '  "recipe": "packages/packages",'
         '  "target_file": "windows_build_and_platform_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_stable.version"'
+        '  "upload_packages": true'
         '}'
       priority: 30
       execution_timeout_secs: 5400
@@ -96969,11 +96866,11 @@
         path: "builder"
       }
       caches {
-        name: "packages_main_certs_version_9563bb"
+        name: "packages_main_certs_default"
         path: "certs"
       }
       caches {
-        name: "packages_main_vs_build_version_vs2019"
+        name: "packages_main_vs_build_default"
         path: "vs_build"
       }
       caches {
@@ -109625,6 +109522,7 @@
         '  "bringup": false,'
         '  "clobber": false,'
         '  "dependencies": [],'
+        '  "fuchsia_ctl_version": "",'
         '  "git_branch": "main",'
         '  "git_repo": "packages",'
         '  "gold_tryjob": false,'
@@ -110812,6 +110710,63 @@
       }
     }
     builders {
+      name: "Linux fuchsia_ctl"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$fuchsia/goma": {'
+        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+        '  },'
+        '  "$kitchen": {'
+        '    "emulate_gce": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "add_recipes_cq": true,'
+        '  "bringup": false,'
+        '  "clobber": false,'
+        '  "dependencies": [],'
+        '  "fuchsia_ctl_version": "",'
+        '  "git_branch": "main",'
+        '  "git_repo": "packages",'
+        '  "gold_tryjob": false,'
+        '  "goma_jobs": "200",'
+        '  "mastername": "client.flutter",'
+        '  "os": "Linux",'
+        '  "recipe": "fuchsia_ctl",'
+        '  "upload_packages": true'
+        '}'
+      priority: 30
+      execution_timeout_secs: 16200
+      expiration_secs: 86400
+      caches {
+        name: "packages_main_builder"
+        path: "builder"
+      }
+      caches {
+        name: "pub_cache"
+        path: ".pub-cache"
+      }
+      build_numbers: YES
+      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Linux fuchsia_f5 Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "os:Linux"
@@ -193346,84 +193301,6 @@
       }
     }
     builders {
-      name: "Windows custom_package_tests master - packages"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "add_recipes_cq": true,'
-        '  "bringup": false,'
-        '  "channel": "master",'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
-        '    },'
-        '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "git_branch": "main",'
-        '  "git_repo": "packages",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "os": "Windows",'
-        '  "recipe": "packages/packages",'
-        '  "target_file": "windows_custom_package_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 5400
-      expiration_secs: 86400
-      caches {
-        name: "packages_main_builder"
-        path: "builder"
-      }
-      caches {
-        name: "packages_main_certs_version_9563bb"
-        path: "certs"
-      }
-      caches {
-        name: "packages_main_vs_build_version_vs2019"
-        path: "vs_build"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows customer_testing"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -193498,84 +193375,6 @@
       }
     }
     builders {
-      name: "Windows dart_unit_tests master - packages"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "add_recipes_cq": true,'
-        '  "bringup": false,'
-        '  "channel": "master",'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
-        '    },'
-        '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "git_branch": "main",'
-        '  "git_repo": "packages",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "os": "Windows",'
-        '  "recipe": "packages/packages",'
-        '  "target_file": "windows_dart_unit_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 5400
-      expiration_secs: 86400
-      caches {
-        name: "packages_main_builder"
-        path: "builder"
-      }
-      caches {
-        name: "packages_main_certs_version_9563bb"
-        path: "certs"
-      }
-      caches {
-        name: "packages_main_vs_build_version_vs2019"
-        path: "vs_build"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows device_doctor"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "os:Windows"
@@ -199431,17 +199230,15 @@
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "add_recipes_cq": true,'
-        '  "bringup": false,'
+        '  "bringup": true,'
         '  "channel": "master",'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
+        '      "dependency": "vs_build"'
         '    },'
         '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
+        '      "dependency": "certs"'
         '    }'
         '  ],'
         '  "device_type": "none",'
@@ -199453,8 +199250,7 @@
         '  "os": "Windows",'
         '  "recipe": "packages/packages",'
         '  "target_file": "windows_build_and_platform_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
+        '  "upload_packages": true'
         '}'
       priority: 30
       execution_timeout_secs: 5400
@@ -199464,11 +199260,11 @@
         path: "builder"
       }
       caches {
-        name: "packages_main_certs_version_9563bb"
+        name: "packages_main_certs_default"
         path: "certs"
       }
       caches {
-        name: "packages_main_vs_build_version_vs2019"
+        name: "packages_main_vs_build_default"
         path: "vs_build"
       }
       caches {
@@ -199587,17 +199383,15 @@
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "add_recipes_cq": true,'
-        '  "bringup": false,'
+        '  "bringup": true,'
         '  "channel": "stable",'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
+        '      "dependency": "vs_build"'
         '    },'
         '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
+        '      "dependency": "certs"'
         '    }'
         '  ],'
         '  "device_type": "none",'
@@ -199609,8 +199403,7 @@
         '  "os": "Windows",'
         '  "recipe": "packages/packages",'
         '  "target_file": "windows_build_and_platform_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_stable.version"'
+        '  "upload_packages": true'
         '}'
       priority: 30
       execution_timeout_secs: 5400
@@ -199620,11 +199413,11 @@
         path: "builder"
       }
       caches {
-        name: "packages_main_certs_version_9563bb"
+        name: "packages_main_certs_default"
         path: "certs"
       }
       caches {
-        name: "packages_main_vs_build_version_vs2019"
+        name: "packages_main_vs_build_default"
         path: "vs_build"
       }
       caches {
@@ -205081,6 +204874,7 @@
         '  "bringup": false,'
         '  "clobber": false,'
         '  "dependencies": [],'
+        '  "fuchsia_ctl_version": "",'
         '  "git_branch": "main",'
         '  "git_repo": "packages",'
         '  "gold_tryjob": true,'
@@ -206239,6 +206033,61 @@
       }
     }
     builders {
+      name: "Linux fuchsia_ctl"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.flutter.try"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$fuchsia/goma": {'
+        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+        '  },'
+        '  "$kitchen": {'
+        '    "emulate_gce": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "add_recipes_cq": true,'
+        '  "bringup": false,'
+        '  "clobber": false,'
+        '  "dependencies": [],'
+        '  "fuchsia_ctl_version": "",'
+        '  "git_branch": "main",'
+        '  "git_repo": "packages",'
+        '  "gold_tryjob": true,'
+        '  "goma_jobs": "200",'
+        '  "mastername": "client.flutter",'
+        '  "os": "Linux",'
+        '  "recipe": "fuchsia_ctl",'
+        '  "upload_packages": false'
+        '}'
+      execution_timeout_secs: 16200
+      caches {
+        name: "packages_main_builder"
+        path: "builder"
+      }
+      caches {
+        name: "pub_cache"
+        path: ".pub-cache"
+      }
+      build_numbers: YES
+      service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Linux fuchsia_precache"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
@@ -235805,82 +235654,6 @@
       }
     }
     builders {
-      name: "Windows custom_package_tests master - packages"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.flutter.try"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "add_recipes_cq": true,'
-        '  "bringup": false,'
-        '  "channel": "master",'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
-        '    },'
-        '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "git_branch": "main",'
-        '  "git_repo": "packages",'
-        '  "gold_tryjob": true,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "os": "Windows",'
-        '  "recipe": "packages/packages",'
-        '  "target_file": "windows_custom_package_tests.yaml",'
-        '  "upload_packages": false,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      execution_timeout_secs: 5400
-      caches {
-        name: "packages_main_builder"
-        path: "builder"
-      }
-      caches {
-        name: "packages_main_certs_version_9563bb"
-        path: "certs"
-      }
-      caches {
-        name: "packages_main_vs_build_version_vs2019"
-        path: "vs_build"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      build_numbers: YES
-      service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows customer_testing"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -235953,82 +235726,6 @@
       }
     }
     builders {
-      name: "Windows dart_unit_tests master - packages"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.flutter.try"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$fuchsia/goma": {'
-        '    "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
-        '  },'
-        '  "$kitchen": {'
-        '    "emulate_gce": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "add_recipes_cq": true,'
-        '  "bringup": false,'
-        '  "channel": "master",'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
-        '    },'
-        '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "git_branch": "main",'
-        '  "git_repo": "packages",'
-        '  "gold_tryjob": true,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "os": "Windows",'
-        '  "recipe": "packages/packages",'
-        '  "target_file": "windows_dart_unit_tests.yaml",'
-        '  "upload_packages": false,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      execution_timeout_secs: 5400
-      caches {
-        name: "packages_main_builder"
-        path: "builder"
-      }
-      caches {
-        name: "packages_main_certs_version_9563bb"
-        path: "certs"
-      }
-      caches {
-        name: "packages_main_vs_build_version_vs2019"
-        path: "vs_build"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      build_numbers: YES
-      service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows device_doctor"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "os:Windows"
@@ -238774,17 +238471,15 @@
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "add_recipes_cq": true,'
-        '  "bringup": false,'
+        '  "bringup": true,'
         '  "channel": "master",'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
+        '      "dependency": "vs_build"'
         '    },'
         '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
+        '      "dependency": "certs"'
         '    }'
         '  ],'
         '  "device_type": "none",'
@@ -238796,8 +238491,7 @@
         '  "os": "Windows",'
         '  "recipe": "packages/packages",'
         '  "target_file": "windows_build_and_platform_tests.yaml",'
-        '  "upload_packages": false,'
-        '  "version_file": "flutter_master.version"'
+        '  "upload_packages": false'
         '}'
       execution_timeout_secs: 5400
       caches {
@@ -238805,11 +238499,11 @@
         path: "builder"
       }
       caches {
-        name: "packages_main_certs_version_9563bb"
+        name: "packages_main_certs_default"
         path: "certs"
       }
       caches {
-        name: "packages_main_vs_build_version_vs2019"
+        name: "packages_main_vs_build_default"
         path: "vs_build"
       }
       caches {
@@ -238926,17 +238620,15 @@
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "add_recipes_cq": true,'
-        '  "bringup": false,'
+        '  "bringup": true,'
         '  "channel": "stable",'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
-        '      "dependency": "vs_build",'
-        '      "version": "version:vs2019"'
+        '      "dependency": "vs_build"'
         '    },'
         '    {'
-        '      "dependency": "certs",'
-        '      "version": "version:9563bb"'
+        '      "dependency": "certs"'
         '    }'
         '  ],'
         '  "device_type": "none",'
@@ -238948,8 +238640,7 @@
         '  "os": "Windows",'
         '  "recipe": "packages/packages",'
         '  "target_file": "windows_build_and_platform_tests.yaml",'
-        '  "upload_packages": false,'
-        '  "version_file": "flutter_stable.version"'
+        '  "upload_packages": false'
         '}'
       execution_timeout_secs: 5400
       caches {
@@ -238957,11 +238648,11 @@
         path: "builder"
       }
       caches {
-        name: "packages_main_certs_version_9563bb"
+        name: "packages_main_certs_default"
         path: "certs"
       }
       caches {
-        name: "packages_main_vs_build_version_vs2019"
+        name: "packages_main_vs_build_default"
         path: "vs_build"
       }
       caches {
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 4566812..cb67682 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -11237,18 +11237,15 @@
   id: "packages-try"
   name: "Packages try builders"
   builders {
-    name: "buildbucket/luci.flutter.try/Windows custom_package_tests master - packages"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.try/Windows dart_unit_tests master - packages"
-  }
-  builders {
     name: "buildbucket/luci.flutter.try/Windows win32-platform_tests master - packages"
   }
   builders {
     name: "buildbucket/luci.flutter.try/Windows win32-platform_tests stable - packages"
   }
   builders {
+    name: "buildbucket/luci.flutter.try/Linux fuchsia_ctl"
+  }
+  builders {
     name: "buildbucket/luci.flutter.try/Linux ci_yaml packages roller"
   }
   favicon_url: "https://storage.googleapis.com/flutter_infra/favicon.ico"
@@ -11261,16 +11258,6 @@
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.flutter.staging/Windows custom_package_tests master - packages"
-    category: "Windows"
-    short_name: "wcptm"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Windows dart_unit_tests master - packages"
-    category: "Windows"
-    short_name: "wdutm"
-  }
-  builders {
     name: "buildbucket/luci.flutter.staging/Windows win32-platform_tests master - packages"
     category: "Windows"
     short_name: "wwtm-"
@@ -11281,6 +11268,11 @@
     short_name: "wwts-"
   }
   builders {
+    name: "buildbucket/luci.flutter.staging/Linux fuchsia_ctl"
+    category: "Linux"
+    short_name: "lfc"
+  }
+  builders {
     name: "buildbucket/luci.flutter.staging/Linux ci_yaml packages roller"
     category: "Linux"
     short_name: "lcypr"
@@ -11294,16 +11286,6 @@
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.flutter.prod/Windows custom_package_tests master - packages"
-    category: "Windows"
-    short_name: "wcptm"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.prod/Windows dart_unit_tests master - packages"
-    category: "Windows"
-    short_name: "wdutm"
-  }
-  builders {
     name: "buildbucket/luci.flutter.prod/Windows win32-platform_tests master - packages"
     category: "Windows"
     short_name: "wwtm-"
@@ -11314,6 +11296,11 @@
     short_name: "wwts-"
   }
   builders {
+    name: "buildbucket/luci.flutter.prod/Linux fuchsia_ctl"
+    category: "Linux"
+    short_name: "lfc"
+  }
+  builders {
     name: "buildbucket/luci.flutter.prod/Linux ci_yaml packages roller"
     category: "Linux"
     short_name: "lcypr"
diff --git a/config/generated/flutter/luci/luci-scheduler.cfg b/config/generated/flutter/luci/luci-scheduler.cfg
index c60a999..1af7411 100644
--- a/config/generated/flutter/luci/luci-scheduler.cfg
+++ b/config/generated/flutter/luci/luci-scheduler.cfg
@@ -278,6 +278,34 @@
   }
 }
 job {
+  id: "Linux ci_yaml packages roller"
+  realm: "prod"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "prod"
+    builder: "Linux ci_yaml packages roller"
+  }
+}
+job {
+  id: "Linux fuchsia_ctl"
+  realm: "prod"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 3
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "prod"
+    builder: "Linux fuchsia_ctl"
+  }
+}
+job {
   id: "Linux fuchsia_f5 Fuchsia"
   realm: "prod"
   triggering_policy {
@@ -6893,6 +6921,34 @@
   }
 }
 job {
+  id: "Windows win32-platform_tests master - packages"
+  realm: "staging"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+    max_batch_size: 6
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "staging"
+    builder: "Windows win32-platform_tests master - packages"
+  }
+}
+job {
+  id: "Windows win32-platform_tests stable - packages"
+  realm: "staging"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 1
+    max_batch_size: 6
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "staging"
+    builder: "Windows win32-platform_tests stable - packages"
+  }
+}
+job {
   id: "Windows_android beta basic_material_app_win__compile"
   realm: "prod"
   triggering_policy {
@@ -7557,6 +7613,10 @@
 trigger {
   id: "main-gitiles-trigger-packages"
   realm: "prod"
+  triggers: "Linux ci_yaml packages roller"
+  triggers: "Linux fuchsia_ctl"
+  triggers: "Windows win32-platform_tests master - packages"
+  triggers: "Windows win32-platform_tests stable - packages"
   gitiles {
     repo: "https://flutter.googlesource.com/mirrors/packages"
     refs: "regexp:refs/heads/main"