diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh
index 7fd99b609c9a..bd2aa5dc1573 100755
--- a/.github/workflows/scripts/qemu-2-start.sh
+++ b/.github/workflows/scripts/qemu-2-start.sh
@@ -1,241 +1,228 @@
 #!/usr/bin/env bash
 
 ######################################################################
 # 2) start qemu with some operating system, init via cloud-init
 ######################################################################
 
 set -eu
 
 # short name used in zfs-qemu.yml
 OS="$1"
 
 # OS variant (virt-install --os-variant list)
 OSv=$OS
 
 # compressed with .zst extension
 REPO="https://github.com/mcmilk/openzfs-freebsd-images"
 FREEBSD="$REPO/releases/download/v2024-12-14"
 URLzs=""
 
 # Ubuntu mirrors
 #UBMIRROR="https://cloud-images.ubuntu.com"
 #UBMIRROR="https://mirrors.cloud.tencent.com/ubuntu-cloud-images"
 UBMIRROR="https://mirror.citrahost.com/ubuntu-cloud-images"
 
 # default nic model for vm's
 NIC="virtio"
 
 case "$OS" in
   almalinux8)
     OSNAME="AlmaLinux 8"
     URL="https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-latest.x86_64.qcow2"
     ;;
   almalinux9)
     OSNAME="AlmaLinux 9"
     URL="https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-latest.x86_64.qcow2"
     ;;
   archlinux)
     OSNAME="Archlinux"
     URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2"
     # dns sometimes fails with that url  :/
     echo "89.187.191.12  geo.mirror.pkgbuild.com" | sudo tee /etc/hosts > /dev/null
     ;;
   centos-stream10)
     OSNAME="CentOS Stream 10"
     # TODO: #16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo
     OSv="centos-stream9"
     URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2"
     ;;
   centos-stream9)
     OSNAME="CentOS Stream 9"
     URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
     ;;
   debian11)
     OSNAME="Debian 11"
     URL="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2"
     ;;
   debian12)
     OSNAME="Debian 12"
     URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
     ;;
   fedora40)
     OSNAME="Fedora 40"
     OSv="fedora-unknown"
     URL="https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
     ;;
   fedora41)
     OSNAME="Fedora 41"
     OSv="fedora-unknown"
     URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
     ;;
-  freebsd13-3r)
-    OSNAME="FreeBSD 13.3-RELEASE"
-    OSv="freebsd13.0"
-    URLzs="$FREEBSD/amd64-freebsd-13.3-RELEASE.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    NIC="rtl8139"
-    ;;
   freebsd13-4r)
     OSNAME="FreeBSD 13.4-RELEASE"
     OSv="freebsd13.0"
     URLzs="$FREEBSD/amd64-freebsd-13.4-RELEASE.qcow2.zst"
     BASH="/usr/local/bin/bash"
     NIC="rtl8139"
     ;;
-  freebsd14-1r)
-    OSNAME="FreeBSD 14.1-RELEASE"
-    OSv="freebsd14.0"
-    URLzs="$FREEBSD/amd64-freebsd-14.1-RELEASE.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    ;;
   freebsd14-2r)
     OSNAME="FreeBSD 14.2-RELEASE"
     OSv="freebsd14.0"
     URLzs="$FREEBSD/amd64-freebsd-14.2-RELEASE.qcow2.zst"
     BASH="/usr/local/bin/bash"
     ;;
   freebsd13-4s)
     OSNAME="FreeBSD 13.4-STABLE"
     OSv="freebsd13.0"
     URLzs="$FREEBSD/amd64-freebsd-13.4-STABLE.qcow2.zst"
     BASH="/usr/local/bin/bash"
     NIC="rtl8139"
     ;;
   freebsd14-2s)
     OSNAME="FreeBSD 14.2-STABLE"
     OSv="freebsd14.0"
     URLzs="$FREEBSD/amd64-freebsd-14.2-STABLE.qcow2.zst"
     BASH="/usr/local/bin/bash"
     ;;
   freebsd15-0c)
     OSNAME="FreeBSD 15.0-CURRENT"
     OSv="freebsd14.0"
     URLzs="$FREEBSD/amd64-freebsd-15.0-CURRENT.qcow2.zst"
     BASH="/usr/local/bin/bash"
     ;;
   tumbleweed)
     OSNAME="openSUSE Tumbleweed"
     OSv="opensusetumbleweed"
     MIRROR="http://opensuse-mirror-gce-us.susecloud.net"
     URL="$MIRROR/tumbleweed/appliances/openSUSE-MicroOS.x86_64-OpenStack-Cloud.qcow2"
     ;;
   ubuntu20)
     OSNAME="Ubuntu 20.04"
     OSv="ubuntu20.04"
     URL="$UBMIRROR/focal/current/focal-server-cloudimg-amd64.img"
     ;;
   ubuntu22)
     OSNAME="Ubuntu 22.04"
     OSv="ubuntu22.04"
     URL="$UBMIRROR/jammy/current/jammy-server-cloudimg-amd64.img"
     ;;
   ubuntu24)
     OSNAME="Ubuntu 24.04"
     OSv="ubuntu24.04"
     URL="$UBMIRROR/noble/current/noble-server-cloudimg-amd64.img"
     ;;
   *)
     echo "Wrong value for OS variable!"
     exit 111
     ;;
 esac
 
 # environment file
 ENV="/var/tmp/env.txt"
 echo "ENV=$ENV" >> $ENV
 
 # result path
 echo 'RESPATH="/var/tmp/test_results"' >> $ENV
 
 # FreeBSD 13 has problems with: e1000+virtio
 echo "NIC=$NIC" >> $ENV
 
 # freebsd15 -> used in zfs-qemu.yml
 echo "OS=$OS" >> $ENV
 
 # freebsd14.0 -> used for virt-install
 echo "OSv=\"$OSv\"" >> $ENV
 
 # FreeBSD 15 (Current) -> used for summary
 echo "OSNAME=\"$OSNAME\"" >> $ENV
 
 sudo mkdir -p "/mnt/tests"
 sudo chown -R $(whoami) /mnt/tests
 
 # we are downloading via axel, curl and wget are mostly slower and
 # require more return value checking
 IMG="/mnt/tests/cloudimg.qcow2"
 if [ ! -z "$URLzs" ]; then
   echo "Loading image $URLzs ..."
   time axel -q -o "$IMG.zst" "$URLzs"
   zstd -q -d --rm "$IMG.zst"
 else
   echo "Loading image $URL ..."
   time axel -q -o "$IMG" "$URL"
 fi
 
 DISK="/dev/zvol/zpool/openzfs"
 FORMAT="raw"
 sudo zfs create -ps -b 64k -V 80g zpool/openzfs
 while true; do test -b $DISK && break; sleep 1; done
 echo "Importing VM image to zvol..."
 sudo qemu-img dd -f qcow2 -O raw if=$IMG of=$DISK bs=4M
 rm -f $IMG
 
 PUBKEY=$(cat ~/.ssh/id_ed25519.pub)
 cat <<EOF > /tmp/user-data
 #cloud-config
 
 fqdn: $OS
 
 users:
 - name: root
   shell: $BASH
 - name: zfs
   sudo: ALL=(ALL) NOPASSWD:ALL
   shell: $BASH
   ssh_authorized_keys:
     - $PUBKEY
 
 growpart:
   mode: auto
   devices: ['/']
   ignore_growroot_disabled: false
 EOF
 
 sudo virsh net-update default add ip-dhcp-host \
   "<host mac='52:54:00:83:79:00' ip='192.168.122.10'/>" --live --config
 
 sudo virt-install \
   --os-variant $OSv \
   --name "openzfs" \
   --cpu host-passthrough \
   --virt-type=kvm --hvm \
   --vcpus=4,sockets=1 \
   --memory $((1024*12)) \
   --memballoon model=virtio \
   --graphics none \
   --network bridge=virbr0,model=$NIC,mac='52:54:00:83:79:00' \
   --cloud-init user-data=/tmp/user-data \
   --disk $DISK,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
   --import --noautoconsole >/dev/null
 
 # Give the VMs hostnames so we don't have to refer to them with
 # hardcoded IP addresses.
 #
 # vm0:          Initial VM we install dependencies and build ZFS on.
 # vm1..2        Testing VMs
 for i in {0..9} ; do
   echo "192.168.122.1$i vm$i" | sudo tee -a /etc/hosts
 done
 
 # in case the directory isn't there already
 mkdir -p $HOME/.ssh
 
 cat <<EOF >> $HOME/.ssh/config
 # no questions please
 StrictHostKeyChecking no
 
 # small timeout, used in while loops later
 ConnectTimeout 1
 EOF
diff --git a/.github/workflows/zfs-qemu.yml b/.github/workflows/zfs-qemu.yml
index cf466bcf1aa3..a0939dd8c2a3 100644
--- a/.github/workflows/zfs-qemu.yml
+++ b/.github/workflows/zfs-qemu.yml
@@ -1,180 +1,180 @@
 name: zfs-qemu
 
 on:
   push:
   pull_request:
   workflow_dispatch:
     inputs:
       include_stream9:
         type: boolean
         required: false
         default: false
         description: 'Test on CentOS 9 stream'
       include_stream10:
         type: boolean
         required: false
         default: false
         description: 'Test on CentOS 10 stream'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
   test-config:
     name: Setup
     runs-on: ubuntu-24.04
     outputs:
       test_os: ${{ steps.os.outputs.os }}
       ci_type: ${{ steps.os.outputs.ci_type }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Generate OS config and CI type
         id: os
         run: |
-          FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-3r", "freebsd13-4s", "freebsd14-1r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
-          QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-2r", "ubuntu24"]'
+          FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
+          QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd14-2r", "ubuntu24"]'
           # determine CI type when running on PR
           ci_type="full"
           if ${{ github.event_name == 'pull_request' }}; then
             head=${{ github.event.pull_request.head.sha }}
             base=${{ github.event.pull_request.base.sha }}
             ci_type=$(python3 .github/workflows/scripts/generate-ci-type.py $head $base)
           fi
           if [ "$ci_type" == "quick" ]; then
             os_selection="$QUICK_OS"
           else
             os_selection="$FULL_OS"
           fi
           os_json=$(echo ${os_selection} | jq -c)
 
           # Add optional runners
           if [ "${{ github.event.inputs.include_stream9 }}" == 'true' ]; then
             os_json=$(echo $os_json | jq -c '. += ["centos-stream9"]')
           fi
           if [ "${{ github.event.inputs.include_stream10 }}" == 'true' ]; then
             os_json=$(echo $os_json | jq -c '. += ["centos-stream10"]')
           fi
 
           echo $os_json
           echo "os=$os_json" >> $GITHUB_OUTPUT
           echo "ci_type=$ci_type" >> $GITHUB_OUTPUT
 
   qemu-vm:
     name: qemu-x86
     needs: [ test-config ]
     strategy:
       fail-fast: false
       matrix:
         # rhl:     almalinux8, almalinux9, centos-stream9, fedora40, fedora41
         # debian:  debian11, debian12, ubuntu20, ubuntu22, ubuntu24
         # misc:    archlinux, tumbleweed
         # FreeBSD variants of 2024-12:
-        # FreeBSD Release: freebsd13-3r, freebsd13-4r, freebsd14-1r, freebsd14-2r
+        # FreeBSD Release: freebsd13-4r, freebsd14-2r
         # FreeBSD Stable:  freebsd13-4s, freebsd14-2s
         # FreeBSD Current: freebsd15-0c
         os: ${{ fromJson(needs.test-config.outputs.test_os) }}
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
 
     - name: Setup QEMU
       timeout-minutes: 10
       run: .github/workflows/scripts/qemu-1-setup.sh
 
     - name: Start build machine
       timeout-minutes: 10
       run: .github/workflows/scripts/qemu-2-start.sh ${{ matrix.os }}
 
     - name: Install dependencies
       timeout-minutes: 20
       run: .github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }}
 
     - name: Build modules
       timeout-minutes: 30
       run: .github/workflows/scripts/qemu-4-build.sh --poweroff --enable-debug ${{ matrix.os }}
 
     - name: Setup testing machines
       timeout-minutes: 5
       run: .github/workflows/scripts/qemu-5-setup.sh
 
     - name: Run tests
       timeout-minutes: 270
       run: .github/workflows/scripts/qemu-6-tests.sh
       env:
         CI_TYPE: ${{ needs.test-config.outputs.ci_type }}
 
     - name: Prepare artifacts
       if: always()
       timeout-minutes: 10
       run: .github/workflows/scripts/qemu-7-prepare.sh
 
     - uses: actions/upload-artifact@v4
       id: artifact-upload
       if: always()
       with:
         name: Logs-functional-${{ matrix.os }}
         path: /tmp/qemu-${{ matrix.os }}.tar
         if-no-files-found: ignore
 
     - name: Test Summary
       if: always()
       run: .github/workflows/scripts/qemu-8-summary.sh '${{ steps.artifact-upload.outputs.artifact-url }}'
 
   cleanup:
     if: always()
     name: Cleanup
     runs-on: ubuntu-latest
     needs: [ qemu-vm ]
 
     steps:
     - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
     - uses: actions/download-artifact@v4
     - name: Generating summary
       run: .github/workflows/scripts/qemu-9-summary-page.sh
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 2
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 3
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 4
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 5
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 6
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 7
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 8
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 9
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 10
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 11
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 12
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 13
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 14
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 15
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 16
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 17
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 18
     - name: Generating summary...
       run: .github/workflows/scripts/qemu-9-summary-page.sh 19
     - uses: actions/upload-artifact@v4
       with:
         name: Summary Files
         path: out-*