diff --git a/.cirrus.yml b/.cirrus.yml
index 40f980581..79b883a38 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -78,7 +78,7 @@ opensuse-15_task:
 
 freebsd_task:
   freebsd_instance:
-    image_family: freebsd-14-2
+    image_family: freebsd-14-3
   install_script: pkg install -y git ninja patchelf
   << : *test
 
diff --git a/ci/alpine-3.docker b/ci/alpine-3.docker
index 06e24cce6..309614dc3 100644
--- a/ci/alpine-3.docker
+++ b/ci/alpine-3.docker
@@ -4,4 +4,4 @@
 
 # 20250212
 FROM alpine:3
-RUN apk add --no-cache python3-dev py3-pip build-base ninja-is-really-ninja git patchelf
+RUN apk add --no-cache python3-dev py3-pip build-base ninja-is-really-ninja git patchelf cmake
diff --git a/ci/archlinux.docker b/ci/archlinux.docker
index 84c5e25f7..674d69941 100644
--- a/ci/archlinux.docker
+++ b/ci/archlinux.docker
@@ -4,4 +4,4 @@
 
 # 20250127
 FROM archlinux:latest
-RUN pacman -Syu --noconfirm && pacman -S --noconfirm python python-pip gcc ninja git patchelf
+RUN pacman -Syu --noconfirm && pacman -S --noconfirm python python-pip gcc ninja git patchelf cmake
diff --git a/ci/debian-11.docker b/ci/debian-11.docker
index e107fcd43..a9f77b12a 100644
--- a/ci/debian-11.docker
+++ b/ci/debian-11.docker
@@ -4,4 +4,4 @@
 
 # 20250212
 FROM debian:bullseye
-RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv cmake && rm -rf /var/lib/apt/lists/*
diff --git a/ci/debian-12.docker b/ci/debian-12.docker
index 249680e3a..5ecdac634 100644
--- a/ci/debian-12.docker
+++ b/ci/debian-12.docker
@@ -4,4 +4,4 @@
 
 # 20250127
 FROM debian:bookworm
-RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv cmake && rm -rf /var/lib/apt/lists/*
diff --git a/ci/debian-unstable.docker b/ci/debian-unstable.docker
index b877cb805..ed4153ffb 100644
--- a/ci/debian-unstable.docker
+++ b/ci/debian-unstable.docker
@@ -4,4 +4,4 @@
 
 # 20230816
 FROM debian:unstable
-RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv cmake g++ && rm -rf /var/lib/apt/lists/*
diff --git a/ci/fedora-41.docker b/ci/fedora-41.docker
index 61acb7a8f..98cd31703 100644
--- a/ci/fedora-41.docker
+++ b/ci/fedora-41.docker
@@ -4,4 +4,4 @@
 
 # 20250127
 FROM fedora:41
-RUN dnf -y update && dnf -y install python3-devel python3-pip gcc ninja-build git patchelf && dnf clean all
+RUN dnf -y update && dnf -y install python3-devel python3-pip gcc gcc-c++ ninja-build git patchelf cmake && dnf clean all
diff --git a/ci/miniconda.docker b/ci/miniconda.docker
index 3f90b5b6a..a6896d409 100644
--- a/ci/miniconda.docker
+++ b/ci/miniconda.docker
@@ -4,4 +4,4 @@
 
 # 20240204
 FROM continuumio/miniconda3
-RUN apt-get update && apt-get install -y gcc ninja-build git patchelf && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y gcc g++ ninja-build git patchelf cmake && rm -rf /var/lib/apt/lists/*
diff --git a/ci/opensuse-15.docker b/ci/opensuse-15.docker
index 3967894ee..c9a025c0f 100644
--- a/ci/opensuse-15.docker
+++ b/ci/opensuse-15.docker
@@ -4,4 +4,4 @@
 
 # 20240817
 FROM opensuse/leap:latest
-RUN zypper --non-interactive install python311 python311-pip python311-devel gcc ninja git patchelf && zypper clean --all && ln -s python3.11 /usr/bin/python3
+RUN zypper --non-interactive install python311 python311-pip python311-devel gcc gcc-c++ ninja git patchelf cmake && zypper clean --all && ln -fs python3.11 /usr/bin/python3