diff --git a/.cirrus.yml b/.cirrus.yml
index c4620509ce..6d8936f1b4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,7 +2,7 @@ task:
   name: freebsd amd64
   skip: "changesIncludeOnly('doc/*')"
   freebsd_instance:
-    image_family: freebsd-14-1
+    image_family: freebsd-14-2
 
   install_script: |
     pkg install -y cmake            \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af508da4fb..44c873fb8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -181,8 +181,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - os: ubuntu-20.04
-          avif: OFF     # Not supported on Ubuntu20.04
+        - os: ubuntu-22.04
+          avif: ON
           gles: ON
           gtk3: ON
           minaudio: ON