diff --git a/.ci.yaml b/.ci.yaml
index 314883c8dda7f..65e5d9a78a3d2 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -279,7 +279,6 @@ targets:
 
   - name: Linux clangd
     recipe: engine_v2/engine_v2
-    bringup: true
     properties:
       config_name: linux_unopt_debug_no_rbe
 
@@ -369,8 +368,11 @@ targets:
       - os=Mac-13
 
   - name: Mac clangd
-    recipe: engine_v2/engine_v2
     bringup: true
+    recipe: engine_v2/engine_v2
+    # Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
+    drone_dimensions:
+      - os=Linux
     properties:
       config_name: mac_unopt_debug_no_rbe
 
diff --git a/ci/builders/linux_unopt_debug_no_rbe.json b/ci/builders/linux_unopt_debug_no_rbe.json
index 566ece3c5ff63..38ee6cbd60cb8 100644
--- a/ci/builders/linux_unopt_debug_no_rbe.json
+++ b/ci/builders/linux_unopt_debug_no_rbe.json
@@ -1,7 +1,11 @@
 {
   "_comment": [
     "This build is only used to generate compile_commands.json for clangd ",
-    "and should not be used for any other purpose."
+    "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": [
     {
@@ -11,13 +15,16 @@
         "debug",
         "--unoptimized",
         "--prebuilt-dart-sdk",
+        "--no-lto",
         "--no-rbe",
-        "--no-goma"
+        "--no-goma",
+        "--target-dir",
+        "linux_unopt_debug_no_rbe"
       ],
       "name": "linux_unopt_debug_no_rbe",
       "ninja": {
         "config": "linux_unopt_debug_no_rbe",
-        "targets": ["flutter/build/dart:copy_dart_sdk"]
+        "targets": ["flutter/tools/font_subset"]
       },
       "tests": [
         {
diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json
index 2c8c5eddab5d0..af2acdd1950f1 100644
--- a/ci/builders/mac_unopt_debug_no_rbe.json
+++ b/ci/builders/mac_unopt_debug_no_rbe.json
@@ -1,7 +1,11 @@
 {
   "_comment": [
     "This build is only used to generate compile_commands.json for clangd ",
-    "and should not be used for any other purpose."
+    "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": [
     {
@@ -16,14 +20,17 @@
         "debug",
         "--unoptimized",
         "--prebuilt-dart-sdk",
+        "--no-lto",
         "--no-rbe",
         "--no-goma",
-        "--xcode-symlinks"
+        "--xcode-symlinks",
+        "--target-dir",
+        "mac_unopt_debug_no_rbe"
       ],
       "name": "mac_unopt_debug_no_rbe",
       "ninja": {
         "config": "mac_unopt_debug_no_rbe",
-        "targets": ["flutter/build/dart:copy_dart_sdk"]
+        "targets": ["flutter/tools/font_subset"]
       },
       "tests": [
         {