diff --git a/config/devicelab_staging_config.star b/config/devicelab_staging_config.star
index 8984530..facbbf3 100644
--- a/config/devicelab_staging_config.star
+++ b/config/devicelab_staging_config.star
@@ -39,14 +39,6 @@
 # Linux staging tasks that run on Samsung devices.
 SAMSUNGTASKS = [
     "backdrop_filter_perf__timeline_summary",
-    "complex_layout_scroll_perf__timeline_summary",
-    "cubic_bezier_perf__timeline_summary",
-    "cull_opacity_perf__timeline_summary",
-    "imagefiltered_transform_animation_perf__timeline_summary",
-    "new_gallery__transition_perf",
-    "picture_cache_perf__timeline_summary",
-    "platform_views_scroll_perf__timeline_summary",
-    "textfield_perf__timeline_summary",
 ]
 
 # Default caches for Linux builders
@@ -232,6 +224,7 @@
                         "dependency": "ios_signing",
                     },
                 ],
+                "tags": ["devicelab", "ios", "mac", "intel"],
                 "task_name": task,
                 "git_branch": DEFAULT_BRANCH,
                 "use_cas": True,
@@ -276,6 +269,7 @@
                         "dependency": "open_jdk",
                     },
                 ],
+                "tags": ["devicelab", "android", "mac", "intel"],
                 "task_name": task,
                 "git_branch": DEFAULT_BRANCH,
                 "use_cas": True,
@@ -301,6 +295,7 @@
             "task_name": "plugin_test_ios",
             "git_branch": DEFAULT_BRANCH,
             "use_cas": True,
+            "tags": ["hostonly", "mac", "intel"],
             "$flutter/osx_sdk": {
                 "sdk_version": "12c33",
             },
@@ -341,6 +336,7 @@
             triggering_policy = triggering_policy,
             properties = {
                 "dependencies": [{"dependency": "xcode"}, {"dependency": "gems"}],
+                "tags": ["hostonly", "mac", "arm64"],
                 "task_name": task,
                 "git_branch": DEFAULT_BRANCH,
                 "use_cas": True,
@@ -361,20 +357,12 @@
     linux_tasks = [
         "android_obfuscate_test",
         "backdrop_filter_perf__timeline_summary",
-        "complex_layout_scroll_perf__timeline_summary",
-        "cubic_bezier_perf__timeline_summary",
-        "cull_opacity_perf__timeline_summary",
         "flutter_gallery__transition_perf",
         "flutter_gallery__transition_perf_e2e",
         "flutter_gallery__transition_perf_hybrid",
         "flutter_gallery__transition_perf_with_semantics",
         "flutter_gallery_sksl_warmup__transition_perf",
         "flutter_gallery_sksl_warmup__transition_perf_e2e",
-        "imagefiltered_transform_animation_perf__timeline_summary",
-        "new_gallery__transition_perf",
-        "picture_cache_perf__timeline_summary",
-        "platform_views_scroll_perf__timeline_summary",
-        "textfield_perf__timeline_summary",
         "microbenchmarks",
     ]
 
@@ -404,6 +392,7 @@
                         "dependency": "curl",
                     },
                 ],
+                "tags": ["devicelab", "android", "linux", "Samsung" if task in SAMSUNGTASKS else "motog4"],
                 "task_name": task,
                 "git_branch": DEFAULT_BRANCH,
                 "use_cas": True,
@@ -418,47 +407,6 @@
             caches = LINUX_DEFAULT_CACHES,
         )
 
-        # Temp workaround to run `flutter_gallery__transition_perf` in both Samsung and MotoG4.
-        # TODO(keyonghan): to be removed after validation https://github.com/flutter/flutter/issues/92612
-        if task == "flutter_gallery__transition_perf":
-            common.linux_prod_builder(
-                name = "Linux_android_staging %s|%s" % (task, common.short_name(task)),
-                recipe = drone_recipe_name,
-                console_view_name = console_view_name,
-                triggered_by = [trigger_name],
-                triggering_policy = triggering_policy,
-                notifies = None,
-                properties = {
-                    "dependencies": [
-                        {
-                            "dependency": "android_sdk",
-                            "version": "version:29.0",
-                        },
-                        {
-                            "dependency": "chrome_and_driver",
-                        },
-                        {
-                            "dependency": "open_jdk",
-                            "version": "11",
-                        },
-                        {
-                            "dependency": "curl",
-                        },
-                    ],
-                    "task_name": task,
-                    "git_branch": DEFAULT_BRANCH,
-                    "use_cas": True,
-                    "upload_metrics": True,
-                },
-                category = "Linux_android",
-                bucket = "staging",
-                pool = "luci.flutter.staging",
-                os = LINUX_OS,
-                dimensions = {"device_os": "R"},
-                expiration_timeout = timeout.LONG_EXPIRATION,
-                caches = LINUX_DEFAULT_CACHES,
-            )
-
     # Windows staging builders.
     common.windows_prod_builder(
         name = "Windows_staging build_aar_module_test|aarm",
@@ -473,6 +421,7 @@
                 {"dependency": "open_jdk"},
                 {"dependency": "certs"},
             ],
+            "tags": ["hostonly", "windows"],
             "task_name": "build_aar_module_test",
             "git_branch": DEFAULT_BRANCH,
             "use_cas": True,
@@ -506,6 +455,7 @@
                     {"dependency": "chrome_and_driver"},
                     {"dependency": "open_jdk"},
                 ],
+                "tags": ["devicelab", "android", "windows"],
                 "task_name": task,
                 "git_branch": DEFAULT_BRANCH,
                 "use_cas": True,
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 4511981..4cc1cd9 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -107240,6 +107240,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "flutter_gallery__transition_perf",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -107326,6 +107332,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "flutter_gallery__transition_perf_e2e",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -107412,6 +107424,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "flutter_gallery__transition_perf_hybrid",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -107498,6 +107516,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "flutter_gallery__transition_perf_with_semantics",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -107584,6 +107608,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "flutter_gallery_sksl_warmup__transition_perf",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -107670,6 +107700,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "flutter_gallery_sksl_warmup__transition_perf_e2e",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -107756,6 +107792,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "android_obfuscate_test",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -107842,6 +107884,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "Samsung"'
+        '  ],'
         '  "task_name": "backdrop_filter_perf__timeline_summary",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -107882,436 +107930,6 @@
       }
     }
     builders {
-      name: "Linux_android_staging complex_layout_scroll_perf__timeline_summary"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "complex_layout_scroll_perf__timeline_summary",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging cubic_bezier_perf__timeline_summary"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "cubic_bezier_perf__timeline_summary",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging cull_opacity_perf__timeline_summary"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "cull_opacity_perf__timeline_summary",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging flutter_gallery__transition_perf"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "flutter_gallery__transition_perf",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging imagefiltered_transform_animation_perf__timeline_summary"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "imagefiltered_transform_animation_perf__timeline_summary",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging microbenchmarks"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_os:N"
@@ -108358,6 +107976,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "linux",'
+        '    "motog4"'
+        '  ],'
         '  "task_name": "microbenchmarks",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -108398,350 +108022,6 @@
       }
     }
     builders {
-      name: "Linux_android_staging new_gallery__transition_perf"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "new_gallery__transition_perf",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging picture_cache_perf__timeline_summary"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "picture_cache_perf__timeline_summary",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging platform_views_scroll_perf__timeline_summary"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "platform_views_scroll_perf__timeline_summary",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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_android_staging textfield_perf__timeline_summary"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_os:R"
-      dimensions: "os:Debian"
-      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"'
-        '  },'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "android_sdk",'
-        '      "version": "version:29.0"'
-        '    },'
-        '    {'
-        '      "dependency": "chrome_and_driver"'
-        '    },'
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "11"'
-        '    },'
-        '    {'
-        '      "dependency": "curl"'
-        '    }'
-        '  ],'
-        '  "git_branch": "master",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "mastername": "client.flutter",'
-        '  "recipe": "devicelab/devicelab_drone",'
-        '  "task_name": "textfield_perf__timeline_summary",'
-        '  "upload_metrics": true,'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      execution_timeout_secs: 3600
-      expiration_secs: 43200
-      caches {
-        name: "android_sdk"
-        path: "android"
-      }
-      caches {
-        name: "builder_linux_devicelab_staging"
-        path: "builder"
-      }
-      caches {
-        name: "chrome_and_driver"
-        path: "chrome"
-      }
-      caches {
-        name: "flutter_sdk"
-        path: "flutter sdk"
-      }
-      caches {
-        name: "openjdk"
-        path: "java"
-      }
-      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: "Mac Staging Engine Drone"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "device_type:none"
@@ -109223,6 +108503,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "drive_perf_debug_warning",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -109304,6 +108590,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "hello_world_android__compile",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -109385,6 +108677,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "hot_mode_dev_cycle__benchmark",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -109466,6 +108764,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_test_test",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -109547,6 +108851,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_ui_frame_number",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -109628,6 +108938,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "run_release_test",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -109709,6 +109025,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "build_ios_framework_module_test",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -109786,6 +109107,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "flutter_gallery_ios__compile",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -109863,6 +109189,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "hello_world_android__compile",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -109940,6 +109271,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "hello_world_ios__compile",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110017,6 +109353,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "hot_mode_dev_cycle_macos_target__benchmark",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110094,6 +109435,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "integration_test_test",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110171,6 +109517,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "ios_app_with_extensions_test",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110248,6 +109599,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "ios_content_validation_test",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110325,6 +109681,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "macos_chrome_dev_mode",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110402,6 +109763,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "module_test_ios",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110479,6 +109845,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "native_ui_tests_ios",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110556,6 +109927,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "native_ui_tests_macos",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110633,6 +110009,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "plugin_lint_mac",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110710,6 +110091,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "arm64"'
+        '  ],'
         '  "task_name": "run_release_test",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110893,6 +110279,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "flutter_gallery__transition_perf_e2e_ios",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -110973,6 +110365,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "flutter_gallery_ios__transition_perf",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -111053,6 +110451,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "flutter_gallery_ios_sksl_warmup__transition_perf",'
         '  "upload_metrics": true,'
         '  "upload_packages": true,'
@@ -111857,6 +111261,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "animation_with_microtasks_perf_ios__timeline_summary",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -111937,6 +111347,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "backdrop_filter_perf_ios__timeline_summary",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112017,6 +111433,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "basic_material_app_ios__compile",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112097,6 +111519,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "channels_integration_test_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112177,6 +111605,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "complex_layout_ios__compile",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112257,6 +111691,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "complex_layout_ios__start_up",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112337,6 +111777,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "complex_layout_scroll_perf_ios__timeline_summary",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112417,6 +111863,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "external_ui_integration_test_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112497,6 +111949,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "flavors_test_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112577,6 +112035,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "flutter_gallery_ios__compile",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112657,6 +112121,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "flutter_gallery_ios__start_up",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112737,6 +112207,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "flutter_view_ios__start_up",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112817,6 +112293,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "hello_world_ios__compile",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112897,6 +112379,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "hot_mode_dev_cycle_macos_target__benchmark",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -112977,6 +112465,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_test_test_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113057,6 +112551,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_ui_ios_driver",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113137,6 +112637,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_ui_ios_frame_number",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113217,6 +112723,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_ui_ios_keyboard_resize",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113297,6 +112809,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_ui_ios_screenshot",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113377,6 +112895,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "integration_ui_ios_textfield",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113457,6 +112981,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "ios_app_with_extensions_test",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113537,6 +113067,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "ios_content_validation_test",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113617,6 +113153,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "ios_defines_test",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113697,6 +113239,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "ios_platform_view_tests",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113777,6 +113325,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "large_image_changer_perf_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113857,6 +113411,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "macos_chrome_dev_mode",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -113937,6 +113497,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "microbenchmarks_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114017,6 +113583,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "new_gallery_ios__transition_perf",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114097,6 +113669,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "platform_channel_sample_test_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114177,6 +113755,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "platform_channel_sample_test_swift",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114257,6 +113841,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "platform_interaction_test_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114337,6 +113927,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "platform_view_ios__start_up",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114417,6 +114013,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "platform_views_scroll_perf_ios__timeline_summary",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114497,6 +114099,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "post_backdrop_filter_perf_ios__timeline_summary",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114577,6 +114185,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "simple_animation_perf_ios",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114657,6 +114271,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "smoke_catalina_hot_mode_dev_cycle_ios__benchmark",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114737,6 +114357,12 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "ios",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "tiles_scroll_perf_ios__timeline_summary",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -114814,6 +114440,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "mac",'
+        '    "intel"'
+        '  ],'
         '  "task_name": "plugin_test_ios",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -115503,6 +115134,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "windows"'
+        '  ],'
         '  "task_name": "basic_material_app_win__compile",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -115561,6 +115197,10 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "hostonly",'
+        '    "windows"'
+        '  ],'
         '  "task_name": "build_aar_module_test",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -115645,6 +115285,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "windows"'
+        '  ],'
         '  "task_name": "channels_integration_test_win",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -115701,6 +115346,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "windows"'
+        '  ],'
         '  "task_name": "flavors_test_win",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -115757,6 +115407,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "windows"'
+        '  ],'
         '  "task_name": "flutter_gallery_win__compile",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -115813,6 +115468,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "windows"'
+        '  ],'
         '  "task_name": "hot_mode_dev_cycle_win__benchmark",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -115869,6 +115529,11 @@
         '  "goma_jobs": "200",'
         '  "mastername": "client.flutter",'
         '  "recipe": "devicelab/devicelab_drone",'
+        '  "tags": ['
+        '    "devicelab",'
+        '    "android",'
+        '    "windows"'
+        '  ],'
         '  "task_name": "windows_chrome_dev_mode",'
         '  "upload_packages": true,'
         '  "use_cas": true'
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 078f1b4..75de9e2 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -358,51 +358,6 @@
     short_name: "bfpts"
   }
   builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging complex_layout_scroll_perf__timeline_summary"
-    category: "Linux_android"
-    short_name: "clspt"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging cubic_bezier_perf__timeline_summary"
-    category: "Linux_android"
-    short_name: "cbpts"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging cull_opacity_perf__timeline_summary"
-    category: "Linux_android"
-    short_name: "copts"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging flutter_gallery__transition_perf"
-    category: "Linux_android"
-    short_name: "fgtp"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging imagefiltered_transform_animation_perf__timeline_summary"
-    category: "Linux_android"
-    short_name: "itapt"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging new_gallery__transition_perf"
-    category: "Linux_android"
-    short_name: "ngtp"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging picture_cache_perf__timeline_summary"
-    category: "Linux_android"
-    short_name: "pcpts"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging platform_views_scroll_perf__timeline_summary"
-    category: "Linux_android"
-    short_name: "pvspt"
-  }
-  builders {
-    name: "buildbucket/luci.flutter.staging/Linux_android_staging textfield_perf__timeline_summary"
-    category: "Linux_android"
-    short_name: "tpts"
-  }
-  builders {
     name: "buildbucket/luci.flutter.staging/Linux_android_staging microbenchmarks"
     category: "Linux_android"
     short_name: "m"
diff --git a/config/generated/flutter/luci/luci-scheduler.cfg b/config/generated/flutter/luci/luci-scheduler.cfg
index 98a7f3e..ac73dc5 100644
--- a/config/generated/flutter/luci/luci-scheduler.cfg
+++ b/config/generated/flutter/luci/luci-scheduler.cfg
@@ -8666,81 +8666,6 @@
   }
 }
 job {
-  id: "Linux_android_staging complex_layout_scroll_perf__timeline_summary"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging complex_layout_scroll_perf__timeline_summary"
-  }
-}
-job {
-  id: "Linux_android_staging cubic_bezier_perf__timeline_summary"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging cubic_bezier_perf__timeline_summary"
-  }
-}
-job {
-  id: "Linux_android_staging cull_opacity_perf__timeline_summary"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging cull_opacity_perf__timeline_summary"
-  }
-}
-job {
-  id: "Linux_android_staging flutter_gallery__transition_perf"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging flutter_gallery__transition_perf"
-  }
-}
-job {
-  id: "Linux_android_staging imagefiltered_transform_animation_perf__timeline_summary"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging imagefiltered_transform_animation_perf__timeline_summary"
-  }
-}
-job {
   id: "Linux_android_staging microbenchmarks"
   realm: "staging"
   acl_sets: "staging"
@@ -8756,66 +8681,6 @@
   }
 }
 job {
-  id: "Linux_android_staging new_gallery__transition_perf"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging new_gallery__transition_perf"
-  }
-}
-job {
-  id: "Linux_android_staging picture_cache_perf__timeline_summary"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging picture_cache_perf__timeline_summary"
-  }
-}
-job {
-  id: "Linux_android_staging platform_views_scroll_perf__timeline_summary"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging platform_views_scroll_perf__timeline_summary"
-  }
-}
-job {
-  id: "Linux_android_staging textfield_perf__timeline_summary"
-  realm: "staging"
-  acl_sets: "staging"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 1
-    max_batch_size: 20
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "staging"
-    builder: "Linux_android_staging textfield_perf__timeline_summary"
-  }
-}
-job {
   id: "Mac Android AOT Engine"
   realm: "prod"
   acl_sets: "prod"
@@ -18544,16 +18409,7 @@
   triggers: "Linux_android flutter_gallery_sksl_warmup__transition_perf_e2e"
   triggers: "Linux_android_staging android_obfuscate_test"
   triggers: "Linux_android_staging backdrop_filter_perf__timeline_summary"
-  triggers: "Linux_android_staging complex_layout_scroll_perf__timeline_summary"
-  triggers: "Linux_android_staging cubic_bezier_perf__timeline_summary"
-  triggers: "Linux_android_staging cull_opacity_perf__timeline_summary"
-  triggers: "Linux_android_staging flutter_gallery__transition_perf"
-  triggers: "Linux_android_staging imagefiltered_transform_animation_perf__timeline_summary"
   triggers: "Linux_android_staging microbenchmarks"
-  triggers: "Linux_android_staging new_gallery__transition_perf"
-  triggers: "Linux_android_staging picture_cache_perf__timeline_summary"
-  triggers: "Linux_android_staging platform_views_scroll_perf__timeline_summary"
-  triggers: "Linux_android_staging textfield_perf__timeline_summary"
   triggers: "Mac_android_staging drive_perf_debug_warning"
   triggers: "Mac_android_staging hello_world_android__compile"
   triggers: "Mac_android_staging hot_mode_dev_cycle__benchmark"