diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 8f535c7e77..43c709228d 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -118,6 +118,11 @@ fi
 case "$OS_RELEASE_ID" in
     ubuntu) ;;
     fedora)
+        # Force a crun version that has this fix: https://github.com/containers/crun/pull/819
+        # FIXME: Remove once a fixed crun made its way into Fedora
+        if test "$OS_RELEASE_VER" == "35"; then
+            yum upgrade -y https://kojipkgs.fedoraproject.org//work/tasks/684/80280684/crun-1.3-2.fc35.x86_64.rpm
+        fi
         if ((CONTAINER==0)); then
             # All SELinux distros need this for systemd-in-a-container
             msg "Enabling container_manage_cgroup"