diff --git a/.cirrus.yml b/.cirrus.yml
index e70ace73a5b0..3bb583b9c1a2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,20 +1,24 @@
 # $FreeBSD$
 
 freebsd_instance:
   image: freebsd-12-1-release-amd64
   cpu: 8
   memory: 24G
 
 env:
   CIRRUS_CLONE_DEPTH: 1
 
 task:
   timeout_in: 120m
   install_script:
   - pkg install -y qemu-devel uefi-edk2-qemu-x86_64
+  setup_user_script:
+  - pw useradd user
+  - mkdir -p /usr/obj/$(pwd -P)
+  - chown user:user /usr/obj/$(pwd -P)
   script:
-  - make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel
+  - su user -c "make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel"
   package_script:
-  - make WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages
+  - su user -c "make WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages"
   test_script:
   - sh tools/boot/ci-qemu-test.sh