diff --git a/.ci.yaml b/.ci.yaml
index bc79a74b34e57..1f970459af914 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -98,9 +98,10 @@ targets:
     bringup: true
     enabled_branches:
       - main
-    recipe: engine_v2/engine_v2
+    recipe: engine_v2/builder
     properties:
       config_name: linux_android_emulator_skia
+      kvm: "1"
       dependencies: >-
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
@@ -118,9 +119,10 @@ targets:
   - name: Linux linux_android_emulator_skia_tests_34
     enabled_branches:
       - main
-    recipe: engine_v2/engine_v2
+    recipe: engine_v2/builder
     properties:
       config_name: linux_android_emulator_skia_34
+      kvm: "1"
       dependencies: >-
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
@@ -382,7 +384,7 @@ targets:
       - flutter_frontend_server/**
 
   - name: Linux clangd
-    recipe: engine_v2/engine_v2
+    recipe: engine_v2/builder
     properties:
       config_name: linux_unopt_debug_no_rbe
 
diff --git a/ci/builders/linux_android_emulator_skia.json b/ci/builders/linux_android_emulator_skia.json
deleted file mode 100644
index a3d3a63eb63b4..0000000000000
--- a/ci/builders/linux_android_emulator_skia.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    "builds": [
-        {
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux",
-                "kvm=1",
-                "cores=8"
-            ],
-            "gclient_variables": {
-                "use_rbe": true
-            },
-            "gn": [
-                "--android",
-                "--android-cpu=x64",
-                "--no-lto",
-                "--rbe",
-                "--no-goma",
-                "--target-dir",
-                "ci/android_emulator_skia_debug_x64"
-            ],
-            "dependencies": [
-                {
-                    "dependency": "goldctl",
-                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
-                }
-            ],
-            "name": "ci/android_emulator_skia_debug_x64",
-            "description": "Build for debug mode x64 Android Skia scenario app tests.",
-            "ninja": {
-                "config": "ci/android_emulator_skia_debug_x64",
-                "targets": [
-                    "flutter/impeller/toolkit/android:unittests",
-                    "flutter/shell/platform/android:flutter_shell_native_unittests",
-                    "flutter/testing/scenario_app"
-                ]
-            },
-            "tests": [
-                {
-                    "language": "dart",
-                    "name": "Android Scenario App Integration Tests (Skia)",
-                    "test_timeout_secs": 900,
-                    "max_attempts": 2,
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "android_35_google_apis_x64.textpb"
-                        },
-                        {
-                            "dependency": "avd_cipd_version",
-                            "version": "build_id:8740267484269553649"
-                        }
-                    ],
-                    "contexts": [
-                        "android_virtual_device"
-                    ],
-                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
-                    "parameters": [
-                        "--out-dir=../out/ci/android_emulator_skia_debug_x64",
-                        "--no-enable-impeller"
-                    ]
-                },
-                {
-                    "language": "dart",
-                    "name": "Android Scenario App Integration Tests (Skia, SurfaceTexture)",
-                    "test_timeout_secs": 900,
-                    "max_attempts": 2,
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "android_35_google_apis_x64.textpb"
-                        },
-                        {
-                            "dependency": "avd_cipd_version",
-                            "version": "build_id:8740267484269553649"
-                        }
-                    ],
-                    "contexts": [
-                        "android_virtual_device"
-                    ],
-                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
-                    "parameters": [
-                        "--out-dir=../out/ci/android_emulator_skia_debug_x64",
-                        "--no-enable-impeller",
-                        "--force-surface-producer-surface-texture"
-                    ]
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/ci/builders/linux_android_emulator_skia_34.json b/ci/builders/linux_android_emulator_skia_34.json
deleted file mode 100644
index 2f14d32c85699..0000000000000
--- a/ci/builders/linux_android_emulator_skia_34.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    "builds": [
-        {
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux",
-                "kvm=1",
-                "cores=8"
-            ],
-            "gclient_variables": {
-                "use_rbe": true
-            },
-            "gn": [
-                "--android",
-                "--android-cpu=x64",
-                "--no-lto",
-                "--rbe",
-                "--no-goma",
-                "--target-dir",
-                "ci/android_emulator_skia_debug_x64"
-            ],
-            "dependencies": [
-                {
-                    "dependency": "goldctl",
-                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
-                }
-            ],
-            "name": "ci/android_emulator_skia_debug_x64",
-            "description": "Build for debug mode x64 Android Skia scenario app tests.",
-            "ninja": {
-                "config": "ci/android_emulator_skia_debug_x64",
-                "targets": [
-                    "flutter/impeller/toolkit/android:unittests",
-                    "flutter/shell/platform/android:flutter_shell_native_unittests",
-                    "flutter/testing/scenario_app"
-                ]
-            },
-            "tests": [
-                {
-                    "language": "dart",
-                    "name": "Android Scenario App Integration Tests (Skia)",
-                    "test_timeout_secs": 900,
-                    "max_attempts": 2,
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "android_34_google_apis_x64.textpb"
-                        },
-                        {
-                            "dependency": "avd_cipd_version",
-                            "version": "build_id:8740267484269553649"
-                        }
-                    ],
-                    "contexts": [
-                        "android_virtual_device"
-                    ],
-                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
-                    "parameters": [
-                        "--out-dir=../out/ci/android_emulator_skia_debug_x64",
-                        "--no-enable-impeller"
-                    ]
-                },
-                {
-                    "language": "dart",
-                    "name": "Android Scenario App Integration Tests (Skia, SurfaceTexture)",
-                    "test_timeout_secs": 900,
-                    "max_attempts": 2,
-                    "test_dependencies": [
-                        {
-                            "dependency": "android_virtual_device",
-                            "version": "android_34_google_apis_x64.textpb"
-                        },
-                        {
-                            "dependency": "avd_cipd_version",
-                            "version": "build_id:8740267484269553649"
-                        }
-                    ],
-                    "contexts": [
-                        "android_virtual_device"
-                    ],
-                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
-                    "parameters": [
-                        "--out-dir=../out/ci/android_emulator_skia_debug_x64",
-                        "--no-enable-impeller",
-                        "--force-surface-producer-surface-texture"
-                    ]
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json
deleted file mode 100644
index 19f205009b793..0000000000000
--- a/ci/builders/linux_unopt_debug_no_rbe.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "_comment": [
-    "This build is only used to generate compile_commands.json for clangd ",
-    "and should not be used for any other purpose.",
-    "",
-    "Note the `flutter/tools/font_subset` target is only used because if no ",
-    "targets are specified, the build will fail, and if an empty list of ",
-    "targets are specified, all targets are built (wasteful/slow)"
-  ],
-  "builds": [
-    {
-      "drone_dimensions": ["device_type=none", "os=Linux", "cores=32"],
-      "gn": [
-        "--runtime-mode",
-        "debug",
-        "--unoptimized",
-        "--prebuilt-dart-sdk",
-        "--no-lto",
-        "--no-rbe",
-        "--no-goma",
-        "--target-dir",
-        "ci/linux_unopt_debug_no_rbe"
-      ],
-      "name": "ci/linux_unopt_debug_no_rbe",
-      "description": "Tests clangd on Linux.",
-      "ninja": {
-        "config": "ci/linux_unopt_debug_no_rbe",
-        "targets": ["flutter/tools/font_subset"]
-      },
-      "tests": [
-        {
-          "language": "dart",
-          "name": "clangd",
-          "script": "flutter/tools/clangd_check/bin/main.dart",
-          "parameters": [
-            "--clangd=buildtools/linux-x64/clang/bin/clangd",
-            "--compile-commands-dir=../out/ci/linux_unopt_debug_no_rbe"
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/ci/builders/standalone/linux_android_emulator_skia.json b/ci/builders/standalone/linux_android_emulator_skia.json
new file mode 100644
index 0000000000000..afc6dbf6b4c3d
--- /dev/null
+++ b/ci/builders/standalone/linux_android_emulator_skia.json
@@ -0,0 +1,81 @@
+{
+    "gclient_variables": {
+        "use_rbe": true
+    },
+    "gn": [
+        "--android",
+        "--android-cpu=x64",
+        "--no-lto",
+        "--rbe",
+        "--no-goma",
+        "--target-dir",
+        "ci/android_emulator_skia_debug_x64"
+    ],
+    "dependencies": [
+        {
+            "dependency": "goldctl",
+            "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+    ],
+    "name": "ci/android_emulator_skia_debug_x64",
+    "description": "Build for debug mode x64 Android Skia scenario app tests.",
+    "ninja": {
+        "config": "ci/android_emulator_skia_debug_x64",
+        "targets": [
+            "flutter/impeller/toolkit/android:unittests",
+            "flutter/shell/platform/android:flutter_shell_native_unittests",
+            "flutter/testing/scenario_app"
+        ]
+    },
+    "tests": [
+        {
+            "language": "dart",
+            "name": "Android Scenario App Integration Tests (Skia)",
+            "test_timeout_secs": 900,
+            "max_attempts": 2,
+            "test_dependencies": [
+                {
+                    "dependency": "android_virtual_device",
+                    "version": "android_35_google_apis_x64.textpb"
+                },
+                {
+                    "dependency": "avd_cipd_version",
+                    "version": "build_id:8740267484269553649"
+                }
+            ],
+            "contexts": [
+                "android_virtual_device"
+            ],
+            "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+            "parameters": [
+                "--out-dir=../out/ci/android_emulator_skia_debug_x64",
+                "--no-enable-impeller"
+            ]
+        },
+        {
+            "language": "dart",
+            "name": "Android Scenario App Integration Tests (Skia, SurfaceTexture)",
+            "test_timeout_secs": 900,
+            "max_attempts": 2,
+            "test_dependencies": [
+                {
+                    "dependency": "android_virtual_device",
+                    "version": "android_35_google_apis_x64.textpb"
+                },
+                {
+                    "dependency": "avd_cipd_version",
+                    "version": "build_id:8740267484269553649"
+                }
+            ],
+            "contexts": [
+                "android_virtual_device"
+            ],
+            "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+            "parameters": [
+                "--out-dir=../out/ci/android_emulator_skia_debug_x64",
+                "--no-enable-impeller",
+                "--force-surface-producer-surface-texture"
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/standalone/linux_android_emulator_skia_34.json b/ci/builders/standalone/linux_android_emulator_skia_34.json
new file mode 100644
index 0000000000000..cbaf9a95b7732
--- /dev/null
+++ b/ci/builders/standalone/linux_android_emulator_skia_34.json
@@ -0,0 +1,81 @@
+{
+    "gclient_variables": {
+        "use_rbe": true
+    },
+    "gn": [
+        "--android",
+        "--android-cpu=x64",
+        "--no-lto",
+        "--rbe",
+        "--no-goma",
+        "--target-dir",
+        "ci/android_emulator_skia_debug_x64"
+    ],
+    "dependencies": [
+        {
+            "dependency": "goldctl",
+            "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+    ],
+    "name": "ci/android_emulator_skia_debug_x64",
+    "description": "Build for debug mode x64 Android Skia scenario app tests.",
+    "ninja": {
+        "config": "ci/android_emulator_skia_debug_x64",
+        "targets": [
+            "flutter/impeller/toolkit/android:unittests",
+            "flutter/shell/platform/android:flutter_shell_native_unittests",
+            "flutter/testing/scenario_app"
+        ]
+    },
+    "tests": [
+        {
+            "language": "dart",
+            "name": "Android Scenario App Integration Tests (Skia)",
+            "test_timeout_secs": 900,
+            "max_attempts": 2,
+            "test_dependencies": [
+                {
+                    "dependency": "android_virtual_device",
+                    "version": "android_34_google_apis_x64.textpb"
+                },
+                {
+                    "dependency": "avd_cipd_version",
+                    "version": "build_id:8740267484269553649"
+                }
+            ],
+            "contexts": [
+                "android_virtual_device"
+            ],
+            "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+            "parameters": [
+                "--out-dir=../out/ci/android_emulator_skia_debug_x64",
+                "--no-enable-impeller"
+            ]
+        },
+        {
+            "language": "dart",
+            "name": "Android Scenario App Integration Tests (Skia, SurfaceTexture)",
+            "test_timeout_secs": 900,
+            "max_attempts": 2,
+            "test_dependencies": [
+                {
+                    "dependency": "android_virtual_device",
+                    "version": "android_34_google_apis_x64.textpb"
+                },
+                {
+                    "dependency": "avd_cipd_version",
+                    "version": "build_id:8740267484269553649"
+                }
+            ],
+            "contexts": [
+                "android_virtual_device"
+            ],
+            "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+            "parameters": [
+                "--out-dir=../out/ci/android_emulator_skia_debug_x64",
+                "--no-enable-impeller",
+                "--force-surface-producer-surface-texture"
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/standalone/linux_unopt_debug_no_rbe.json b/ci/builders/standalone/linux_unopt_debug_no_rbe.json
new file mode 100644
index 0000000000000..05a775a1cab20
--- /dev/null
+++ b/ci/builders/standalone/linux_unopt_debug_no_rbe.json
@@ -0,0 +1,38 @@
+{
+  "_comment": [
+    "This build is only used to generate compile_commands.json for clangd ",
+    "and should not be used for any other purpose.",
+    "",
+    "Note the `flutter/tools/font_subset` target is only used because if no ",
+    "targets are specified, the build will fail, and if an empty list of ",
+    "targets are specified, all targets are built (wasteful/slow)"
+  ],
+  "gn": [
+    "--runtime-mode",
+    "debug",
+    "--unoptimized",
+    "--prebuilt-dart-sdk",
+    "--no-lto",
+    "--no-rbe",
+    "--no-goma",
+    "--target-dir",
+    "ci/linux_unopt_debug_no_rbe"
+  ],
+  "name": "ci/linux_unopt_debug_no_rbe",
+  "description": "Tests clangd on Linux.",
+  "ninja": {
+    "config": "ci/linux_unopt_debug_no_rbe",
+    "targets": ["flutter/tools/font_subset"]
+  },
+  "tests": [
+    {
+      "language": "dart",
+      "name": "clangd",
+      "script": "flutter/tools/clangd_check/bin/main.dart",
+      "parameters": [
+        "--clangd=buildtools/linux-x64/clang/bin/clangd",
+        "--compile-commands-dir=../out/ci/linux_unopt_debug_no_rbe"
+      ]
+    }
+  ]
+}