diff --git a/.cirrus.yml b/.cirrus.yml
index 83cfe6e5c591..2fdf0d492987 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -39,12 +39,20 @@ task:
       TOOLCHAIN: llvm18
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: amd64-llvm19 World and kernel build and boot smoke test
-    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
+    trigger_type: manual
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
       TOOLCHAIN: llvm19
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
+  - name: amd64-llvm21 World and kernel build and boot smoke test
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*'
+    env:
+      TARGET: amd64
+      TARGET_ARCH: amd64
+      TOOLCHAIN: llvm21
+      TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
   - name: arm64-llvm16 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
@@ -77,6 +85,14 @@ task:
       TARGET_ARCH: aarch64
       TOOLCHAIN: llvm19
       TOOLCHAIN_PKG: ${TOOLCHAIN}
+  - name: arm64-llvm21 World and kernel build and boot smoke test (manual)
+    only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
+    trigger_type: manual
+    env:
+      TARGET: arm64
+      TARGET_ARCH: aarch64
+      TOOLCHAIN: llvm21
+      TOOLCHAIN_PKG: ${TOOLCHAIN}
   - name: amd64-gcc12 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual