diff --git a/config/generated/ci_yaml/engine_beta_config.json b/config/generated/ci_yaml/engine_beta_config.json
index 416a929..768c4b3 100644
--- a/config/generated/ci_yaml/engine_beta_config.json
+++ b/config/generated/ci_yaml/engine_beta_config.json
@@ -1 +1 @@
-{"targets":[{"name":"Linux Android AOT Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_android_aot":"true","android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd"},"recipe":"engine/engine"},{"name":"Linux Android Debug Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_android_debug":"true","build_android_jit_release":"true","build_android_vulkan":"true","android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd"},"recipe":"engine/engine"},{"name":"Linux Android Emulator Tests","bringup":true,"timeout":60,"properties":{"dependencies":"[\n  {\"dependency\": \"android_virtual_device\", \"version\": \"31\"}\n]","upload_packages":"true","clobber":"true"},"recipe":"engine/scenarios"},{"name":"Linux Benchmarks","timeout":60,"properties":{"build_host":"true","upload_metrics":"true"},"presubmit":false,"enabledBranches":["main","master"],"recipe":"engine/engine_metrics"},{"name":"Linux Benchmarks (no-upload)","timeout":60,"properties":{"build_host":"true","upload_metrics":"false"},"recipe":"engine/engine_metrics"},{"name":"Linux Fuchsia","timeout":90,"properties":{"add_recipes_cq":"true","build_fuchsia":"true","fuchsia_ctl_version":"version:0.0.27","clobber":"true"},"recipe":"engine/engine"},{"name":"Linux Fuchsia FEMU","timeout":60,"properties":{"add_recipes_cq":"true","build_fuchsia":"true","fuchsia_ctl_version":"version:0.0.27","clobber":"true"},"recipe":"engine/femu_test"},{"name":"Linux Framework Smoke Tests","timeout":60,"enabledBranches":["main","master"],"recipe":"engine/framework_smoke"},{"name":"Linux Host Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_host":"true"},"recipe":"engine/engine"},{"name":"Linux Unopt","timeout":60,"properties":{"add_recipes_cq":"true","clobber":"true"},"recipe":"engine/engine_unopt"},{"name":"Linux clang-tidy","timeout":60,"properties":{"add_recipes_cq":"true","cores":"32"},"recipe":"engine/engine_lint"},{"name":"Linux Arm Host Engine","timeout":90,"properties":{"add_recipes_cq":"true","build_host":"true"},"recipe":"engine/engine_arm"},{"name":"Linux linux_host_engine","bringup":true,"timeout":60,"properties":{"config_name":"linux_host_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Linux Web Engine","timeout":60,"properties":{"add_recipes_cq":"true","gcs_goldens_bucket":"flutter_logs","dependencies":"[\n  {\"dependency\": \"goldctl\"}\n]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"recipe":"engine/web_engine"},{"name":"Linux Web Framework tests","timeout":60,"properties":{"add_recipes_cq":"true","dependencies":"[\n  {\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"},\n  {\"dependency\": \"curl\", \"version\": \"version:7.64.0\"}\n]","framework":"true","shard":"web_tests","subshards":"[\"0\", \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7_last\"]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"enabledBranches":["main","master"],"recipe":"engine/web_engine_framework"},{"name":"Mac Android AOT Engine","timeout":60,"properties":{"android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd","build_android_aot":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine"},{"name":"Mac Host Engine","timeout":75,"properties":{"add_recipes_cq":"true","build_host":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine"},{"name":"Mac mac_host_engine","bringup":true,"timeout":60,"properties":{"config_name":"mac_host_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Mac Unopt","timeout":75,"properties":{"add_recipes_cq":"true","jazzy_version":"0.14.1","caches":"[\n  {\"name\":\"flutter_cocoapods\",\"path\":\"cocoapods\"},\n  {\"name\":\"osx_sdk_13a233_13_15\",\"path\":\"osx_sdk\"},\n  {\"name\":\"builder_mac_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"},\n  {\"name\":\"xcode_runtime_ios_13_0\",\"path\":\"xcode_runtime_ios_13_0\"},\n  {\"name\":\"xcode_runtime_ios_15_0\",\"path\":\"xcode_runtime_ios_15_0\"}\n]","runtime_versions":"[\n  \"ios-13-0\",\n  \"ios-15-0\"\n]"},"recipe":"engine/engine_unopt"},{"name":"Mac clang-tidy","timeout":75,"properties":{"add_recipes_cq":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine_lint"},{"name":"Mac iOS Engine","timeout":60,"properties":{"build_ios":"true","ios_debug":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine"},{"name":"Mac Web Engine","timeout":60,"properties":{"add_recipes_cq":"true","gcs_goldens_bucket":"flutter_logs","caches":"[\n  {\"name\":\"flutter_cocoapods\",\"path\":\"cocoapods\"},\n  {\"name\":\"old_osx_sdk\",\"path\":\"osx_sdk\"},\n  {\"name\":\"builder_mac_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"goldctl\"}\n]","os":"Mac-10.15","xcode":"12c33"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"recipe":"engine/web_engine"},{"name":"Mac mac_ios_engine","bringup":true,"timeout":60,"properties":{"config_name":"mac_ios_engine","environment":"Staging","dependencies":"[\n  {\"dependency\": \"jazzy\", \"version\": \"0.14.1\"}\n]"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine_profile","bringup":true,"timeout":60,"properties":{"config_name":"mac_ios_engine_profile","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine_release","bringup":true,"timeout":60,"properties":{"config_name":"mac_ios_engine_release","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Windows Android AOT Engine","timeout":60,"properties":{"build_android_aot":"true","android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd"},"recipe":"engine/engine"},{"name":"Windows Host Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_host":"true"},"recipe":"engine/engine"},{"name":"Windows windows_android_aot_engine","bringup":true,"timeout":60,"properties":{"config_name":"windows_android_aot_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Windows windows_host_engine","bringup":true,"timeout":60,"properties":{"config_name":"windows_host_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Windows Unopt","timeout":75,"properties":{"add_recipes_cq":"true"},"recipe":"engine/engine_unopt"},{"name":"Windows UWP Engine","timeout":60,"properties":{"build_windows_uwp":"true"},"recipe":"engine/engine"},{"name":"Windows Web Engine","timeout":60,"properties":{"gcs_goldens_bucket":"flutter_logs"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**"],"recipe":"engine/web_engine"},{"name":"Mac iOS Engine Profile","timeout":90,"properties":{"build_ios":"true","ios_profile":"true","jazzy_version":"0.14.1"},"presubmit":false,"recipe":"engine/engine"},{"name":"Mac iOS Engine Release","timeout":90,"properties":{"build_ios":"true","ios_release":"true","jazzy_version":"0.14.1"},"presubmit":false,"recipe":"engine/engine"},{"name":"Linux ci_yaml engine roller","bringup":true,"recipe":"infra/ci_yaml"}],"enabledBranches":["main","flutter-\\d+\\.\\d+-candidate\\.\\d+"],"platformProperties":{"linux":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_windows_uwp":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n  {\"name\":\"builder_linux_engine\",\"path\":\"builder\"},\n  {\"name\":\"gradle\",\"path\":\"gradle\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"},\n  {\"dependency\": \"gradle_cache\"}\n]","device_type":"none","os":"Linux","cores":"8"}},"mac":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_windows_uwp":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n  {\"name\":\"flutter_cocoapods\",\"path\":\"cocoapods\"},\n  {\"name\":\"osx_sdk_13a233\",\"path\":\"osx_sdk\"},\n  {\"name\":\"builder_mac_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"}\n]","device_type":"none","mac_model":"Macmini8,1","os":"Mac-12","xcode":"13a233"}},"windows":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_windows_uwp":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n  {\"name\":\"builder_win_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"}\n]","device_type":"none","os":"Windows-10"}}}}
+{"targets":[{"name":"Linux Android AOT Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_android_aot":"true","android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd"},"recipe":"engine/engine"},{"name":"Linux Android Debug Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_android_debug":"true","build_android_jit_release":"true","build_android_vulkan":"true","android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd"},"recipe":"engine/engine"},{"name":"Linux Android Emulator Tests","bringup":true,"timeout":60,"properties":{"dependencies":"[\n  {\"dependency\": \"android_virtual_device\", \"version\": \"31\"}\n]","upload_packages":"true","clobber":"true"},"recipe":"engine/scenarios"},{"name":"Linux Benchmarks","timeout":60,"properties":{"build_host":"true","upload_metrics":"true"},"presubmit":false,"enabledBranches":["main","master"],"recipe":"engine/engine_metrics"},{"name":"Linux Benchmarks (no-upload)","timeout":60,"properties":{"build_host":"true","upload_metrics":"false"},"recipe":"engine/engine_metrics"},{"name":"Linux Fuchsia","timeout":90,"properties":{"add_recipes_cq":"true","build_fuchsia":"true","fuchsia_ctl_version":"version:0.0.27","clobber":"true"},"recipe":"engine/engine"},{"name":"Linux Fuchsia FEMU","timeout":60,"properties":{"add_recipes_cq":"true","build_fuchsia":"true","fuchsia_ctl_version":"version:0.0.27","clobber":"true"},"recipe":"engine/femu_test"},{"name":"Linux Framework Smoke Tests","timeout":60,"enabledBranches":["main","master"],"recipe":"engine/framework_smoke"},{"name":"Linux Host Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_host":"true"},"recipe":"engine/engine"},{"name":"Linux Unopt","timeout":60,"properties":{"add_recipes_cq":"true","clobber":"true"},"recipe":"engine/engine_unopt"},{"name":"Linux clang-tidy","timeout":60,"properties":{"add_recipes_cq":"true","cores":"32"},"recipe":"engine/engine_lint"},{"name":"Linux Arm Host Engine","timeout":90,"properties":{"add_recipes_cq":"true","build_host":"true"},"recipe":"engine/engine_arm"},{"name":"Linux linux_host_engine","bringup":true,"timeout":60,"properties":{"config_name":"linux_host_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Linux Web Engine","timeout":60,"properties":{"add_recipes_cq":"true","gcs_goldens_bucket":"flutter_logs","dependencies":"[\n  {\"dependency\": \"goldctl\"}\n]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"recipe":"engine/web_engine"},{"name":"Linux Web Framework tests","timeout":60,"properties":{"add_recipes_cq":"true","dependencies":"[\n  {\"dependency\": \"chrome_and_driver\", \"version\": \"version:96.2\"},\n  {\"dependency\": \"curl\", \"version\": \"version:7.64.0\"}\n]","framework":"true","shard":"web_tests","subshards":"[\"0\", \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7_last\"]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"enabledBranches":["main","master"],"recipe":"engine/web_engine_framework"},{"name":"Mac Android AOT Engine","timeout":60,"properties":{"android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd","build_android_aot":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine"},{"name":"Mac Host Engine","timeout":75,"properties":{"add_recipes_cq":"true","build_host":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine"},{"name":"Mac mac_host_engine","bringup":true,"timeout":60,"properties":{"config_name":"mac_host_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Mac Unopt","timeout":75,"properties":{"add_recipes_cq":"true","jazzy_version":"0.14.1","caches":"[\n  {\"name\":\"flutter_cocoapods\",\"path\":\"cocoapods\"},\n  {\"name\":\"osx_sdk_13a233_13_15\",\"path\":\"osx_sdk\"},\n  {\"name\":\"builder_mac_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"},\n  {\"name\":\"xcode_runtime_ios_13_0\",\"path\":\"xcode_runtime_ios_13_0\"},\n  {\"name\":\"xcode_runtime_ios_15_0\",\"path\":\"xcode_runtime_ios_15_0\"}\n]","runtime_versions":"[\n  \"ios-13-0\",\n  \"ios-15-0\"\n]"},"recipe":"engine/engine_unopt"},{"name":"Mac clang-tidy","timeout":75,"properties":{"add_recipes_cq":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine_lint"},{"name":"Mac iOS Engine","timeout":60,"properties":{"build_ios":"true","ios_debug":"true","jazzy_version":"0.14.1"},"recipe":"engine/engine"},{"name":"Mac Web Engine","timeout":60,"properties":{"add_recipes_cq":"true","gcs_goldens_bucket":"flutter_logs","caches":"[\n  {\"name\":\"flutter_cocoapods\",\"path\":\"cocoapods\"},\n  {\"name\":\"old_osx_sdk\",\"path\":\"osx_sdk\"},\n  {\"name\":\"builder_mac_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"goldctl\"}\n]","os":"Mac-10.15","xcode":"12c33"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"recipe":"engine/web_engine"},{"name":"Mac mac_ios_engine","bringup":true,"timeout":60,"properties":{"config_name":"mac_ios_engine","environment":"Staging","dependencies":"[\n  {\"dependency\": \"jazzy\", \"version\": \"0.14.1\"}\n]"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine_profile","bringup":true,"timeout":60,"properties":{"config_name":"mac_ios_engine_profile","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine_release","bringup":true,"timeout":60,"properties":{"config_name":"mac_ios_engine_release","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Windows Android AOT Engine","timeout":60,"properties":{"build_android_aot":"true","android_sdk_license":"\\n24333f8a63b6825ea9c5514f83c2829b004d1fee","android_sdk_preview_license":"\\n84831b9409646a918e30573bab4c9c91346d8abd"},"recipe":"engine/engine"},{"name":"Windows Host Engine","timeout":60,"properties":{"add_recipes_cq":"true","build_host":"true"},"recipe":"engine/engine"},{"name":"Windows windows_android_aot_engine","bringup":true,"timeout":60,"properties":{"config_name":"windows_android_aot_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Windows windows_host_engine","bringup":true,"timeout":60,"properties":{"config_name":"windows_host_engine","environment":"Staging"},"recipe":"engine_v2/engine_v2"},{"name":"Windows Unopt","timeout":75,"properties":{"add_recipes_cq":"true"},"recipe":"engine/engine_unopt"},{"name":"Windows Web Engine","timeout":60,"properties":{"gcs_goldens_bucket":"flutter_logs"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**"],"recipe":"engine/web_engine"},{"name":"Mac iOS Engine Profile","timeout":90,"properties":{"build_ios":"true","ios_profile":"true","jazzy_version":"0.14.1"},"presubmit":false,"recipe":"engine/engine"},{"name":"Mac iOS Engine Release","timeout":90,"properties":{"build_ios":"true","ios_release":"true","jazzy_version":"0.14.1"},"presubmit":false,"recipe":"engine/engine"},{"name":"Linux ci_yaml engine roller","bringup":true,"recipe":"infra/ci_yaml"}],"enabledBranches":["main","flutter-\\d+\\.\\d+-candidate\\.\\d+"],"platformProperties":{"linux":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n  {\"name\":\"builder_linux_engine\",\"path\":\"builder\"},\n  {\"name\":\"gradle\",\"path\":\"gradle\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"},\n  {\"dependency\": \"gradle_cache\"}\n]","device_type":"none","os":"Ubuntu","cores":"8"}},"mac":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n  {\"name\":\"flutter_cocoapods\",\"path\":\"cocoapods\"},\n  {\"name\":\"osx_sdk_13a233\",\"path\":\"osx_sdk\"},\n  {\"name\":\"builder_mac_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"}\n]","device_type":"none","mac_model":"Macmini8,1","os":"Mac-12","xcode":"13a233"}},"windows":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n  {\"name\":\"builder_win_engine\",\"path\":\"builder\"},\n  {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n  {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"}\n]","device_type":"none","os":"Windows-10"}}}}
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 9fafabb..b087f18 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -1836,7 +1836,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -1868,7 +1868,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -1891,7 +1890,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -1935,7 +1934,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -1967,7 +1966,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -1990,7 +1988,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -2034,7 +2032,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2064,7 +2062,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -2087,7 +2084,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_arm",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -2131,7 +2128,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2160,7 +2157,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -2183,7 +2179,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_metrics",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -2228,7 +2224,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2258,7 +2254,6 @@
         '  "build_fuchsia": true,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": true,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -2282,7 +2277,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -2326,7 +2321,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2356,7 +2351,6 @@
         '  "build_fuchsia": true,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": true,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -2380,7 +2374,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/femu_test",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -2424,7 +2418,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2454,7 +2448,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -2477,7 +2470,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -2521,7 +2514,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2551,7 +2544,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": true,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -2574,7 +2566,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_unopt",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -2618,7 +2610,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2648,7 +2640,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -2674,7 +2665,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/web_engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -3151,7 +3142,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:32"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3181,7 +3172,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": 32,'
         '  "dependencies": ['
@@ -3204,7 +3194,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_lint",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -51157,7 +51147,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -51260,7 +51249,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -51367,7 +51355,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -51482,7 +51469,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -52254,7 +52240,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -52938,7 +52923,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": true,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -53040,7 +53024,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": true,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -53142,7 +53125,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": true,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -79907,7 +79889,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -79995,94 +79976,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "version:1.8.0u202-b08"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "gcs_goldens_bucket": "",'
-        '  "git_branch": "beta",'
-        '  "git_repo": "engine",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "ios_debug": false,'
-        '  "ios_profile": false,'
-        '  "ios_release": false,'
-        '  "mastername": "client.flutter",'
-        '  "no_bitcode": false,'
-        '  "os": "Windows-10",'
-        '  "recipe": "engine/engine",'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      priority: 30
-      execution_timeout_secs: 10800
-      caches {
-        name: "engine_2_14_0_builder"
-        path: "builder"
-      }
-      caches {
-        name: "engine_2_14_0_open_jdk_version_1_8_0u202_b08"
-        path: "open_jdk"
-      }
-      caches {
-        name: "engine_2_14_0_open_jdk_version_1_8_0u202_b08_legacy"
-        path: "java"
-      }
-      caches {
-        name: "pub_cache"
-        path: ".pub-cache"
-      }
-      build_numbers: YES
-      service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {}
-      experiments {
-        key: "luci.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    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 {
-        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"'
-        '  },'
-        '  "bringup": false,'
-        '  "build_android_aot": false,'
-        '  "build_android_debug": false,'
-        '  "build_android_jit_release": false,'
-        '  "build_android_vulkan": false,'
-        '  "build_fuchsia": false,'
-        '  "build_host": false,'
-        '  "build_ios": false,'
-        '  "build_windows_uwp": true,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -80170,7 +80063,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -80257,7 +80149,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -95170,7 +95061,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95202,7 +95093,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95225,7 +95115,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -95270,7 +95160,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95302,7 +95192,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95325,7 +95214,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -95370,7 +95259,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95400,7 +95289,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95423,7 +95311,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_arm",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -95468,7 +95356,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95497,7 +95385,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95520,7 +95407,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_metrics",'
         '  "upload_metrics": false,'
         '  "upload_packages": true,'
@@ -95566,7 +95453,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95596,7 +95483,6 @@
         '  "build_fuchsia": true,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": true,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95620,7 +95506,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -95665,7 +95551,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95695,7 +95581,6 @@
         '  "build_fuchsia": true,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": true,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95719,7 +95604,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/femu_test",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -95764,7 +95649,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95794,7 +95679,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95817,7 +95701,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -95862,7 +95746,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95892,7 +95776,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": true,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -95915,7 +95798,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_unopt",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -95960,7 +95843,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:8"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -95990,7 +95873,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": "8",'
         '  "dependencies": ['
@@ -96016,7 +95898,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/web_engine",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -96498,7 +96380,7 @@
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:32"
       dimensions: "device_type:none"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu"
       dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -96528,7 +96410,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "cores": 32,'
         '  "dependencies": ['
@@ -96551,7 +96432,7 @@
         '  "ios_release": false,'
         '  "mastername": "client.flutter",'
         '  "no_bitcode": false,'
-        '  "os": "Linux",'
+        '  "os": "Ubuntu",'
         '  "recipe": "engine/engine_lint",'
         '  "upload_packages": true,'
         '  "use_cas": true'
@@ -145893,7 +145774,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -145997,7 +145877,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -146105,7 +145984,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -146221,7 +146099,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -146999,7 +146876,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -147690,7 +147566,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": true,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -147793,7 +147668,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": true,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -147896,7 +147770,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": true,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -180398,7 +180271,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -180487,95 +180359,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": true,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
-        '  "clobber": false,'
-        '  "dependencies": ['
-        '    {'
-        '      "dependency": "open_jdk",'
-        '      "version": "version:1.8.0u202-b08"'
-        '    }'
-        '  ],'
-        '  "device_type": "none",'
-        '  "gcs_goldens_bucket": "",'
-        '  "git_branch": "beta",'
-        '  "git_repo": "engine",'
-        '  "gold_tryjob": false,'
-        '  "goma_jobs": "200",'
-        '  "ios_debug": false,'
-        '  "ios_profile": false,'
-        '  "ios_release": false,'
-        '  "mastername": "client.flutter",'
-        '  "no_bitcode": false,'
-        '  "os": "Windows-10",'
-        '  "recipe": "engine/engine",'
-        '  "upload_packages": true,'
-        '  "use_cas": true'
-        '}'
-      priority: 30
-      execution_timeout_secs: 10800
-      expiration_secs: 86400
-      caches {
-        name: "engine_2_14_0_builder"
-        path: "builder"
-      }
-      caches {
-        name: "engine_2_14_0_open_jdk_version_1_8_0u202_b08"
-        path: "open_jdk"
-      }
-      caches {
-        name: "engine_2_14_0_open_jdk_version_1_8_0u202_b08_legacy"
-        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.buildbucket.agent.cipd_installation"
-        value: 0
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "Windows beta UWP Engine"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "device_type:none"
-      dimensions: "os:Windows-10"
-      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"'
-        '  },'
-        '  "bringup": false,'
-        '  "build_android_aot": false,'
-        '  "build_android_debug": false,'
-        '  "build_android_jit_release": false,'
-        '  "build_android_vulkan": false,'
-        '  "build_fuchsia": false,'
-        '  "build_host": false,'
-        '  "build_ios": false,'
-        '  "build_windows_uwp": true,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -180664,7 +180447,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
@@ -180752,7 +180534,6 @@
         '  "build_fuchsia": false,'
         '  "build_host": false,'
         '  "build_ios": false,'
-        '  "build_windows_uwp": false,'
         '  "clobber": false,'
         '  "dependencies": ['
         '    {'
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 7d2318c..75974d8 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -9445,11 +9445,6 @@
     short_name: "wbu"
   }
   builders {
-    name: "buildbucket/luci.flutter.prod/Windows beta UWP Engine"
-    category: "Windows"
-    short_name: "wbue"
-  }
-  builders {
     name: "buildbucket/luci.flutter.prod/Windows beta Web Engine"
     category: "Windows"
     short_name: "wbwe"
@@ -9812,11 +9807,6 @@
     short_name: "wbu"
   }
   builders {
-    name: "buildbucket/luci.flutter.staging/Windows beta UWP Engine"
-    category: "Windows"
-    short_name: "wbue"
-  }
-  builders {
     name: "buildbucket/luci.flutter.staging/Windows beta Web Engine"
     category: "Windows"
     short_name: "wbwe"