diff --git a/config/engine_config.star b/config/engine_config.star
index 8898e50..4006ad1 100644
--- a/config/engine_config.star
+++ b/config/engine_config.star
@@ -42,10 +42,16 @@
 def _setup():
     """Default configurations for branches and repos."""
     dimensions = {
+        "linux": {
+            "device_type": "none",
+        },
         "mac": {
             "device_type": "none",
             "mac_model": "Macmini8,1",
         },
+        "windows": {
+            "device_type": "none",
+        },
     }
     ci_yaml.generate("engine", "stable", release_branches.stable.version, release_branches.stable.testing_ref, dimensions, _engine_properties())
     ci_yaml.generate("engine", "beta", release_branches.beta.version, release_branches.beta.testing_ref, dimensions, _engine_properties())
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index fc3d1ce..856adf3 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -21,6 +21,7 @@
     builders {
       name: "Linux Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -86,6 +87,7 @@
     builders {
       name: "Linux Android Debug Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -151,6 +153,7 @@
     builders {
       name: "Linux Android Scenarios"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -213,6 +216,7 @@
     builders {
       name: "Linux Arm Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -276,6 +280,7 @@
     builders {
       name: "Linux Benchmarks"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -560,6 +565,7 @@
     builders {
       name: "Linux Framework Smoke Tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -622,6 +628,7 @@
     builders {
       name: "Linux Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -686,6 +693,7 @@
     builders {
       name: "Linux Fuchsia FEMU"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -750,6 +758,7 @@
     builders {
       name: "Linux Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -907,6 +916,7 @@
     builders {
       name: "Linux Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -1030,6 +1040,7 @@
     builders {
       name: "Linux Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -1093,6 +1104,7 @@
     builders {
       name: "Linux Web Framework tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2035,6 +2047,7 @@
     builders {
       name: "Linux beta Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2099,6 +2112,7 @@
     builders {
       name: "Linux beta Android Debug Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2163,6 +2177,7 @@
     builders {
       name: "Linux beta Android Scenarios"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2224,6 +2239,7 @@
     builders {
       name: "Linux beta Arm Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2286,6 +2302,7 @@
     builders {
       name: "Linux beta Framework Smoke Tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2347,6 +2364,7 @@
     builders {
       name: "Linux beta Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2410,6 +2428,7 @@
     builders {
       name: "Linux beta Fuchsia FEMU"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2473,6 +2492,7 @@
     builders {
       name: "Linux beta Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2600,6 +2620,7 @@
     builders {
       name: "Linux beta Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2662,6 +2683,7 @@
     builders {
       name: "Linux beta Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -2724,6 +2746,7 @@
     builders {
       name: "Linux beta Web Framework tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -11992,6 +12015,7 @@
     builders {
       name: "Linux dev Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12056,6 +12080,7 @@
     builders {
       name: "Linux dev Android Debug Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12120,6 +12145,7 @@
     builders {
       name: "Linux dev Android Scenarios"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12181,6 +12207,7 @@
     builders {
       name: "Linux dev Arm Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12243,6 +12270,7 @@
     builders {
       name: "Linux dev Framework Smoke Tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12304,6 +12332,7 @@
     builders {
       name: "Linux dev Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12367,6 +12396,7 @@
     builders {
       name: "Linux dev Fuchsia FEMU"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12430,6 +12460,7 @@
     builders {
       name: "Linux dev Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12557,6 +12588,7 @@
     builders {
       name: "Linux dev Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12619,6 +12651,7 @@
     builders {
       name: "Linux dev Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -12681,6 +12714,7 @@
     builders {
       name: "Linux dev Web Framework tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25053,6 +25087,7 @@
     builders {
       name: "Linux stable Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25117,6 +25152,7 @@
     builders {
       name: "Linux stable Android Debug Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25181,6 +25217,7 @@
     builders {
       name: "Linux stable Arm Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25243,6 +25280,7 @@
     builders {
       name: "Linux stable Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25306,6 +25344,7 @@
     builders {
       name: "Linux stable Fuchsia FEMU"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25369,6 +25408,7 @@
     builders {
       name: "Linux stable Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25496,6 +25536,7 @@
     builders {
       name: "Linux stable Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -25558,6 +25599,7 @@
     builders {
       name: "Linux stable Web Framework tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87135,6 +87177,7 @@
     builders {
       name: "Windows Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87370,6 +87413,7 @@
     builders {
       name: "Windows Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87501,6 +87545,7 @@
     builders {
       name: "Windows UWP Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87563,6 +87608,7 @@
     builders {
       name: "Windows Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87626,6 +87672,7 @@
     builders {
       name: "Windows Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87688,6 +87735,7 @@
     builders {
       name: "Windows beta Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87751,6 +87799,7 @@
     builders {
       name: "Windows beta Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87881,6 +87930,7 @@
     builders {
       name: "Windows beta UWP Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -87942,6 +87992,7 @@
     builders {
       name: "Windows beta Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -88004,6 +88055,7 @@
     builders {
       name: "Windows beta Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -90677,6 +90729,7 @@
     builders {
       name: "Windows dev Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -90741,6 +90794,7 @@
     builders {
       name: "Windows dev Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -90872,6 +90926,7 @@
     builders {
       name: "Windows dev UWP Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -90934,6 +90989,7 @@
     builders {
       name: "Windows dev Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -90997,6 +91053,7 @@
     builders {
       name: "Windows dev Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -94387,6 +94444,7 @@
     builders {
       name: "Windows stable Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -94450,6 +94508,7 @@
     builders {
       name: "Windows stable Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -94580,6 +94639,7 @@
     builders {
       name: "Windows stable Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.prod"
       exe {
@@ -100617,6 +100677,7 @@
     builders {
       name: "Linux Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -100681,6 +100742,7 @@
     builders {
       name: "Linux Android Debug Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -100745,6 +100807,7 @@
     builders {
       name: "Linux Android Scenarios"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -100806,6 +100869,7 @@
     builders {
       name: "Linux Arm Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -100960,6 +101024,7 @@
     builders {
       name: "Linux Framework Smoke Tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -101021,6 +101086,7 @@
     builders {
       name: "Linux Fuchsia"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -101084,6 +101150,7 @@
     builders {
       name: "Linux Fuchsia FEMU"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -101147,6 +101214,7 @@
     builders {
       name: "Linux Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -101274,6 +101342,7 @@
     builders {
       name: "Linux Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -101396,6 +101465,7 @@
     builders {
       name: "Linux Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -101458,6 +101528,7 @@
     builders {
       name: "Linux Web Framework tests"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Linux"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -109087,6 +109158,7 @@
     builders {
       name: "Windows Android AOT Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -109194,6 +109266,7 @@
     builders {
       name: "Windows Host Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -109361,6 +109434,7 @@
     builders {
       name: "Windows UWP Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -109422,6 +109496,7 @@
     builders {
       name: "Windows Unopt"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.try"
       exe {
@@ -109484,6 +109559,7 @@
     builders {
       name: "Windows Web Engine"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "device_type:none"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.flutter.try"
       exe {