diff --git a/.cirrus.yml b/.cirrus.yml
index 511c16b0e9e5..8052ce0adb22 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 compute_engine_instance:
   # Image list available via
   # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images
   platform: freebsd
   image_project: freebsd-org-cloud-dev
   image: freebsd-13-0-release-amd64
   cpu: 8
   memory: 8G
   disk: 40
 
 env:
   CIRRUS_CLONE_DEPTH: 1
 
 task:
   matrix:
   - name: World and kernel amd64 build and boot smoke test
     env:
       TARGET: amd64
       TARGET_ARCH: amd64
   - name: World and kernel arm64 build and boot smoke test
     trigger_type: manual
     env:
       TARGET: arm64
       TARGET_ARCH: aarch64
   timeout_in: 120m
   install_script:
-  - sh .cirrus-ci/pkg-install.sh qemu llvm12
+  - sh .cirrus-ci/pkg-install.sh qemu llvm13
   setup_script:
   - uname -a
   - df -m
   - pkg --version
   - pw useradd user
   - mkdir -p /usr/obj/$(pwd -P)
   - chown user:user /usr/obj/$(pwd -P)
   script:
-  - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=llvm12 WITHOUT_TOOLCHAIN=yes buildworld buildkernel"
+  - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=llvm13 WITHOUT_TOOLCHAIN=yes buildworld buildkernel"
   package_script:
-  - su user -c "make CROSS_TOOLCHAIN=llvm12 WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages"
+  - su user -c "make CROSS_TOOLCHAIN=llvm13 WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages"
   test_script:
   - sh tools/boot/ci-qemu-test.sh
   post_script:
   - df -m
   - du -m -s /usr/obj