diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 1e596287b3..fd43cb75a5 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -121,8 +121,18 @@ tasks:
       - "--config=rustfmt"
       - "--config=clippy"
       - "--repo_env=CC=clang"
-      # TODO(hlopko): Make this work (some tests were failing)
-      # - "--linkopt=-fuse-ld=lld"
+    build_targets: *default_linux_targets
+    test_targets: *default_linux_targets
+  ubuntu2004_clang_lld:
+    name: With Clang and LLD
+    platform: ubuntu2004
+    shell_commands:
+      - "sudo apt -y update && sudo apt -y install lld"
+    build_flags:
+      - "--config=rustfmt"
+      - "--config=clippy"
+      - "--repo_env=CC=clang"
+      - "--linkopt=-fuse-ld=lld"
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
   ubuntu2004_rolling_clang:
@@ -132,8 +142,6 @@ tasks:
       - "--config=rustfmt"
       - "--config=clippy"
       - "--repo_env=CC=clang"
-      # TODO(hlopko): Make this work (some tests were failing)
-      # - "--linkopt=-fuse-ld=lld"
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     soft_fail: yes
@@ -191,6 +199,31 @@ tasks:
     test_targets:
       - "//..."
     build_flags: *aspects_flags
+  ubuntu2004_examples_clang:
+    name: Examples with Clang
+    platform: ubuntu2004
+    working_directory: examples
+    build_flags:
+      - "--repo_env=CC=clang"
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+    build_flags: *aspects_flags
+  ubuntu2004_examples_clang_lld:
+    name: Examples with Clang and LLD
+    platform: ubuntu2004
+    shell_commands:
+      - "sudo apt -y update && sudo apt -y install lld"
+    working_directory: examples
+    build_flags:
+      - "--repo_env=CC=clang"
+      - "--linkopt=-fuse-ld=lld"
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+    build_flags: *aspects_flags
   ubuntu2004_examples_rolling:
     name: "Examples with Rolling Bazel Version"
     platform: ubuntu2004