diff --git a/.ci.yaml b/.ci.yaml
index 239cce546881e..0e2436dca702c 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -406,7 +406,7 @@ targets:
   - name: Linux clangd
     recipe: engine_v2/builder
     properties:
-      config_name: linux_unopt_debug_no_rbe
+      config_name: linux_clangd
 
   - name: Linux linux_unopt
     recipe: engine_v2/engine_v2
@@ -503,7 +503,7 @@ targets:
     drone_dimensions:
       - os=Mac-13|Mac-14
 
-  # Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
+  # TODO(jmagman) Replace with "Mac clangd" when bringup is removed.
   - name: Linux mac_clangd
     recipe: engine_v2/engine_v2
     timeout: 90
@@ -514,6 +514,13 @@ targets:
     properties:
       config_name: mac_unopt_debug_no_rbe
 
+  - name: Mac clangd
+    recipe: engine_v2/builder
+    bringup: true
+    properties:
+      config_name: mac_clangd
+      cpu: x86
+
   - name: Mac mac_unopt
     recipe: engine_v2/engine_v2
     properties:
diff --git a/ci/builders/standalone/linux_unopt_debug_no_rbe.json b/ci/builders/standalone/linux_clangd.json
similarity index 97%
rename from ci/builders/standalone/linux_unopt_debug_no_rbe.json
rename to ci/builders/standalone/linux_clangd.json
index 05a775a1cab20..7dc297eb0abe8 100644
--- a/ci/builders/standalone/linux_unopt_debug_no_rbe.json
+++ b/ci/builders/standalone/linux_clangd.json
@@ -7,6 +7,7 @@
     "targets are specified, the build will fail, and if an empty list of ",
     "targets are specified, all targets are built (wasteful/slow)"
   ],
+  "cas_archive": false,
   "gn": [
     "--runtime-mode",
     "debug",
diff --git a/ci/builders/standalone/mac_clangd.json b/ci/builders/standalone/mac_clangd.json
new file mode 100644
index 0000000000000..4f7b01c033e7e
--- /dev/null
+++ b/ci/builders/standalone/mac_clangd.json
@@ -0,0 +1,40 @@
+{
+  "_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)"
+  ],
+  "cas_archive": false,
+  "gn": [
+    "--runtime-mode",
+    "debug",
+    "--unoptimized",
+    "--prebuilt-dart-sdk",
+    "--no-lto",
+    "--no-rbe",
+    "--no-goma",
+    "--xcode-symlinks",
+    "--target-dir",
+    "ci/mac_unopt_debug_no_rbe"
+  ],
+  "name": "ci/mac_unopt_debug_no_rbe",
+  "description": "Tests clangd on macOS.",
+  "ninja": {
+    "config": "ci/mac_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/mac-x64/clang/bin/clangd",
+        "--compile-commands-dir=../out/ci/mac_unopt_debug_no_rbe"
+      ]
+    }
+  ]
+}