diff --git a/.cirrus.yml b/.cirrus.yml
index 6d026f33..94426bba 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,13 +2,13 @@ task:
   matrix:
     - name: FreeBSD -- gcc | g++
       freebsd_instance:
-        image: freebsd-14-2-release-amd64
+        image: freebsd-14-0-release-amd64-ufs
       env:
-        cc: gcc14
-        cxx: g++14
+        cc: gcc13
+        cxx: g++13
     - name: FreeBSD -- clang | clang++
       freebsd_instance:
-        image: freebsd-14-2-release-amd64
+        image: freebsd-14-0-release-amd64-ufs
       env:
         cc: clang
         cxx: clang++
@@ -16,8 +16,8 @@ task:
       macos_instance:
         image: ghcr.io/cirruslabs/macos-monterey-base:latest
       env:
-        cc: gcc-14
-        cxx: g++-14
+        cc: gcc-13
+        cxx: g++-13
     - name: MacOS M1 -- clang | clang++
       macos_instance:
         image: ghcr.io/cirruslabs/macos-monterey-base:latest
@@ -27,9 +27,9 @@ task:
   dependencies_script: |
     echo $(uname)
     if [ "$(uname)" = "FreeBSD" ]; then
-      pkg install -y cmake bash gcc14
+      pkg install -y cmake bash gcc13
     else
-      brew install cmake gcc14
+      brew install cmake gcc@13
     fi
   configure_script: |
     mkdir instdir
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce1d7728..278675f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,8 +115,8 @@ jobs:
           pip install --force-reinstall dist/*.whl
           pytest
 
-#      - name: Upload
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: ${{ matrix.config.os }}
-#          path: build
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.config.os }}
+          path: build