diff --git a/engine/src/flutter/ci/builders/linux_host_engine.json b/engine/src/flutter/ci/builders/linux_host_engine.json
index ab9991e8dcf..ad38deabd99 100644
--- a/engine/src/flutter/ci/builders/linux_host_engine.json
+++ b/engine/src/flutter/ci/builders/linux_host_engine.json
@@ -26,47 +26,47 @@
             "tests": []
         },
         {
-          "archives": [],
-          "drone_dimensions": [
-              "device_type=none",
-              "os=Linux"
-          ],
-          "gclient_variables": {
-              "download_android_deps": false
-          },
-          "gn": [
-              "--runtime-mode",
-              "debug",
-              "--unoptimized",
-              "--prebuilt-dart-sdk",
-              "--target-dir",
-              "host_debug_impeller_vulkan"
-          ],
-          "name": "host_debug_impeller_vulkan",
-          "ninja": {
-              "config": "host_debug_impeller_vulkan",
-              "targets": [
-                  "flutter",
-                  "flutter/sky/packages"
-              ]
-          },
-          "tests": [
-            {
-                "language": "python3",
-                "name": "Host Tests for host_debug_impeller_vulkan",
-                "parameters": [
-                    "--variant",
-                    "host_debug_impeller_vulkan",
-                    "--type",
-                    "impeller-vulkan",
-                    "--engine-capture-core-dump"
-                ],
-                "script": "flutter/testing/run_tests.py",
-                "type": "local"
-            }
-        ]
-      },
-      {
+            "archives": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--unoptimized",
+                "--prebuilt-dart-sdk",
+                "--target-dir",
+                "host_debug_impeller_vulkan"
+            ],
+            "name": "host_debug_impeller_vulkan",
+            "ninja": {
+                "config": "host_debug_impeller_vulkan",
+                "targets": [
+                    "flutter",
+                    "flutter/sky/packages"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug_impeller_vulkan",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_impeller_vulkan",
+                        "--type",
+                        "impeller-vulkan",
+                        "--engine-capture-core-dump"
+                    ],
+                    "script": "flutter/testing/run_tests.py",
+                    "type": "local"
+                }
+            ]
+        },
+        {
             "archives": [
                 {
                     "name": "host_debug",
@@ -99,7 +99,7 @@
             "ninja": {
                 "config": "host_debug",
                 "targets": [
-		    "flutter:unittests",
+                    "flutter:unittests",
                     "flutter/build/archives:artifacts",
                     "flutter/build/archives:dart_sdk_archive",
                     "flutter/build/archives:embedder",
@@ -123,7 +123,7 @@
                     "script": "flutter/testing/run_tests.py",
                     "type": "local"
                 }
-	    ]
+            ]
         },
         {
             "archives": [
@@ -154,9 +154,9 @@
             "ninja": {
                 "config": "host_profile",
                 "targets": [
-		    "flutter/build/dart:copy_dart_sdk",
-		    "flutter/shell/testing",
-		    "flutter/tools/path_ops",
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/shell/testing",
+                    "flutter/tools/path_ops",
                     "flutter/shell/platform/linux:flutter_gtk",
                     "flutter:unittests"
                 ]
@@ -206,16 +206,16 @@
             "ninja": {
                 "config": "host_release",
                 "targets": [
-		    "flutter/build/dart:copy_dart_sdk",
-		    "flutter/display_list:display_list_benchmarks",
-		    "flutter/display_list:display_list_builder_benchmarks",
-		    "flutter/fml:fml_benchmarks",
-		    "flutter/impeller/geometry:geometry_benchmarks",
-		    "flutter/lib/ui:ui_benchmarks",
-		    "flutter/shell/common:shell_benchmarks",
-		    "flutter/shell/testing",
-		    "flutter/third_party/txt:txt_benchmarks",
-		    "flutter/tools/path_ops",
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/display_list:display_list_benchmarks",
+                    "flutter/display_list:display_list_builder_benchmarks",
+                    "flutter/fml:fml_benchmarks",
+                    "flutter/impeller/geometry:geometry_benchmarks",
+                    "flutter/lib/ui:ui_benchmarks",
+                    "flutter/shell/common:shell_benchmarks",
+                    "flutter/shell/testing",
+                    "flutter/third_party/txt:txt_benchmarks",
+                    "flutter/tools/path_ops",
                     "flutter/build/archives:flutter_patched_sdk",
                     "flutter/shell/platform/linux:flutter_gtk",
                     "flutter:unittests"
@@ -236,39 +236,6 @@
                     "type": "local"
                 }
             ]
-        },
-        {
-            "archives": [
-                {
-                    "name": "wasm_release",
-                    "base_path": "out/wasm_release/zip_archives/",
-                    "type": "gcs",
-                    "include_paths": [
-                        "out/wasm_release/zip_archives/flutter-web-sdk.zip"
-                    ]
-                }
-            ],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "gclient_variables": {
-                "download_emsdk": true,
-                "download_android_deps": false
-            },
-            "gn": [
-                "--runtime-mode",
-                "release",
-                "--web"
-            ],
-            "name": "wasm_release",
-            "ninja": {
-                "config": "wasm_release",
-                "targets": [
-                    "flutter/web_sdk:flutter_web_sdk_archive"
-                ]
-            },
-            "tests": []
         }
     ],
     "tests": []
diff --git a/engine/src/flutter/ci/builders/linux_web_engine.json b/engine/src/flutter/ci/builders/linux_web_engine.json
new file mode 100644
index 00000000000..542088004ae
--- /dev/null
+++ b/engine/src/flutter/ci/builders/linux_web_engine.json
@@ -0,0 +1,75 @@
+{
+    "builds": [
+        {
+            "archives": [
+                {
+                    "name": "wasm_release",
+                    "base_path": "out/wasm_release/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/wasm_release/zip_archives/flutter-web-sdk.zip"
+                    ]
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "download_emsdk": true
+            },
+            "gn": [
+                "--build-canvaskit",
+                "--web",
+                "--runtime-mode=release"
+            ],
+            "name": "wasm_release",
+            "ninja": {
+                "config": "wasm_release",
+                "targets": [
+                    "flutter/web_sdk:flutter_web_sdk_archive"
+                ]
+            },
+            "generators": {
+                "pub_dirs": [
+                    "flutter/lib/web_ui/",
+                    "flutter/web_sdk/web_engine_tester/"
+                ],
+                "tasks": [
+                    {
+                        "name": "compile web_tests",
+                        "parameters": [
+                            "run",
+                            "compile_tests"
+                        ],
+                        "scripts": [
+                            "third_party/dart/tools/sdks/dart-sdk/bin/dart",
+                            "flutter/lib/web_ui/dev/felt.dart"
+                        ]
+                    },
+                    {
+                        "name": "check licenses",
+                        "parameters": [
+                            "check-licenses"
+                        ],
+                        "scripts": [
+                            "flutter/lib/web_ui/dev/felt"
+                        ]
+                    },
+                    {
+                        "name": "web engine analysis",
+                        "parameters": [
+                            "analyze"
+                        ],
+                        "scripts": [
+                            "flutter/lib/web_ui/dev/felt"
+                        ]
+                    }
+                ]
+            },
+            "tests": []
+        }
+    ],
+    "tests": []
+}
diff --git a/engine/src/flutter/ci/builders/web_engine.json b/engine/src/flutter/ci/builders/web_engine.json
deleted file mode 100644
index 1ce92ddf05c..00000000000
--- a/engine/src/flutter/ci/builders/web_engine.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "generators": {
-        "pub_dirs": [
-            "flutter/lib/web_ui/",
-            "flutter/web_sdk/web_engine_tester/"
-        ],
-        "tasks": [
-            {
-                "name": "compile web_tests",
-                "parameters": [
-                    "run",
-                    "compile_tests"
-                ],
-                "scripts": [
-                    "out/host_debug_unopt/dart-sdk/bin/dart",
-                    "flutter/lib/web_ui/dev/felt.dart"
-                ]
-            },
-            {
-                "name": "check licenses",
-                "parameters": [
-                    "check-licenses"
-                ],
-                "scripts": [
-                    "out/host_debug_unopt/dart-sdk/bin/dart",
-                    "flutter/lib/web_ui/dev/felt.dart"
-                ]
-            },
-            {
-                "name": "web engine analysis",
-                "parameters": [
-                    "analyze"
-                ],
-                "scripts": [
-                    "out/host_debug_unopt/dart-sdk/bin/dart",
-                    "flutter/lib/web_ui/dev/felt.dart"
-                ]
-            }
-        ]
-    }
-}