diff --git a/config/generated/ci_yaml/packages_config.json b/config/generated/ci_yaml/packages_config.json
index daaf079..e83642a 100644
--- a/config/generated/ci_yaml/packages_config.json
+++ b/config/generated/ci_yaml/packages_config.json
@@ -1 +1 @@
-{"targets":[{"name":"Windows local_tests master - packages","timeout":30,"properties":{"add_recipes_cq":"true","target_file":"windows_local_tests.yaml","channel":"master","version_file":"flutter_master.version","dependencies":"[\n  {\"dependency\": \"vs_build\"}\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\"}\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","dependencies":"[\n  {\"dependency\": \"vs_build\"}\n]\n"},"recipe":"packages/packages"},{"name":"Linux fuchsia_ctl","timeout":90,"properties":{"add_recipes_cq":"true"},"postsubmit":false,"recipe":"fuchsia_ctl"},{"name":"Linux ci_yaml packages roller","recipe":"infra/ci_yaml"}],"enabledBranches":["main"],"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"}}}}
+{"targets":[{"name":"Windows custom_package_tests master - packages","bringup":true,"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\"}\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\"}\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","dependencies":"[\n  {\"dependency\": \"vs_build\"}\n]\n"},"recipe":"packages/packages"},{"name":"Linux fuchsia_ctl","timeout":90,"properties":{"add_recipes_cq":"true"},"postsubmit":false,"recipe":"fuchsia_ctl"},{"name":"Linux ci_yaml packages roller","recipe":"infra/ci_yaml"}],"enabledBranches":["main"],"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 389bef4..e61f40b 100644
--- a/config/generated/flutter/luci/commit-queue.cfg
+++ b/config/generated/flutter/luci/commit-queue.cfg
@@ -289,7 +289,7 @@
         name: "flutter/try/Linux fuchsia_ctl"
       }
       builders {
-        name: "flutter/try/Windows local_tests master - packages"
+        name: "flutter/try/Windows custom_package_tests master - packages"
       }
       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 6f571d2..e46ad88 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -101488,6 +101488,77 @@
       }
     }
     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": true,'
+        '  "channel": "master",'
+        '  "clobber": false,'
+        '  "dependencies": ['
+        '    {'
+        '      "dependency": "vs_build"'
+        '    },'
+        '    {'
+        '      "dependency": "certs"'
+        '    }'
+        '  ],'
+        '  "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: "pub_cache"
+        path: ".pub-cache"
+      }
+      caches {
+        name: "vsbuild"
+        path: "vsbuild"
+      }
+      build_numbers: YES
+      service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.buildbucket.agent.cipd_installation"
+        value: 0
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Windows customer_testing"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -105246,77 +105317,6 @@
       }
     }
     builders {
-      name: "Windows local_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"'
-        '    },'
-        '    {'
-        '      "dependency": "certs"'
-        '    }'
-        '  ],'
-        '  "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_local_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 5400
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "vsbuild"
-        path: "vsbuild"
-      }
-      build_numbers: YES
-      service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows module_custom_host_app_name_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -223669,6 +223669,78 @@
       }
     }
     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": true,'
+        '  "channel": "master",'
+        '  "clobber": false,'
+        '  "dependencies": ['
+        '    {'
+        '      "dependency": "vs_build"'
+        '    },'
+        '    {'
+        '      "dependency": "certs"'
+        '    }'
+        '  ],'
+        '  "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: "pub_cache"
+        path: ".pub-cache"
+      }
+      caches {
+        name: "vsbuild"
+        path: "vsbuild"
+      }
+      build_numbers: YES
+      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.buildbucket.agent.cipd_installation"
+        value: 0
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Windows customer_testing"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -227463,78 +227535,6 @@
       }
     }
     builders {
-      name: "Windows local_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"'
-        '    },'
-        '    {'
-        '      "dependency": "certs"'
-        '    }'
-        '  ],'
-        '  "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_local_tests.yaml",'
-        '  "upload_packages": true,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 5400
-      expiration_secs: 86400
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "vsbuild"
-        path: "vsbuild"
-      }
-      build_numbers: YES
-      service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows module_custom_host_app_name_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -264423,6 +264423,76 @@
       }
     }
     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": true,'
+        '  "channel": "master",'
+        '  "clobber": false,'
+        '  "dependencies": ['
+        '    {'
+        '      "dependency": "vs_build"'
+        '    },'
+        '    {'
+        '      "dependency": "certs"'
+        '    }'
+        '  ],'
+        '  "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: "pub_cache"
+        path: ".pub-cache"
+      }
+      caches {
+        name: "vsbuild"
+        path: "vsbuild"
+      }
+      build_numbers: YES
+      service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {}
+      experiments {
+        key: "luci.buildbucket.agent.cipd_installation"
+        value: 0
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "Windows customer_testing"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -265164,76 +265234,6 @@
       }
     }
     builders {
-      name: "Windows local_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"'
-        '    },'
-        '    {'
-        '      "dependency": "certs"'
-        '    }'
-        '  ],'
-        '  "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_local_tests.yaml",'
-        '  "upload_packages": false,'
-        '  "version_file": "flutter_master.version"'
-        '}'
-      execution_timeout_secs: 5400
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      caches {
-        name: "vsbuild"
-        path: "vsbuild"
-      }
-      build_numbers: YES
-      service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
       name: "Windows module_custom_host_app_name_test"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 261c8f5..f2d8729 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -12650,7 +12650,7 @@
   id: "packages-try"
   name: "Packages try builders"
   builders {
-    name: "buildbucket/luci.flutter.try/Windows local_tests master - packages"
+    name: "buildbucket/luci.flutter.try/Windows custom_package_tests master - packages"
   }
   builders {
     name: "buildbucket/luci.flutter.try/Windows win32-platform_tests master - packages"
@@ -12674,9 +12674,9 @@
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.flutter.staging/Windows local_tests master - packages"
+    name: "buildbucket/luci.flutter.staging/Windows custom_package_tests master - packages"
     category: "Windows"
-    short_name: "wltm-"
+    short_name: "wcptm"
   }
   builders {
     name: "buildbucket/luci.flutter.staging/Windows win32-platform_tests master - packages"
@@ -12707,9 +12707,9 @@
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.flutter.prod/Windows local_tests master - packages"
+    name: "buildbucket/luci.flutter.prod/Windows custom_package_tests master - packages"
     category: "Windows"
-    short_name: "wltm-"
+    short_name: "wcptm"
   }
   builders {
     name: "buildbucket/luci.flutter.prod/Windows win32-platform_tests master - packages"