diff --git a/.cirrus.yml b/.cirrus.yml
index 9f4899577340..64e1766d916b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,13 +15,13 @@ env:
 
 task:
   matrix:
-  - name: World and kernel amd64 build and boot smoke test
+  - name: amd64-llvm15 World and kernel build and boot smoke test
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
       TOOLCHAIN: llvm15
       TOOLCHAIN_PKG: ${TOOLCHAIN}-lite
-  - name: World and kernel arm64 build and boot smoke test
+  - name: arm64-llvm15 World and kernel build and boot smoke test
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
@@ -29,7 +29,7 @@ task:
       TARGET_ARCH: aarch64
       TOOLCHAIN: llvm15
       TOOLCHAIN_PKG: ${TOOLCHAIN}
-  - name: World and kernel gcc12 amd64 build and boot smoke test (manual)
+  - name: amd64-gcc12 World and kernel build and boot smoke test (manual)
     only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src'
     trigger_type: manual
     env:
@@ -37,7 +37,7 @@ task:
       TARGET_ARCH: amd64
       TOOLCHAIN: amd64-gcc12
       TOOLCHAIN_PKG: ${TOOLCHAIN}
-  - name: World and kernel gcc12 amd64 build and boot smoke test (FreeBSD repo)
+  - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo)
     only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src'
     env:
       TARGET: amd64