diff --git a/.cirrus.yml b/.cirrus.yml
index 10db8ee4..c46136f4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,8 +2,8 @@
 cpus: &CPUS 8
 memory: &MEMORY 24GB
 
-config: &CONFIG --build-type=release --enable-static
-memcheck_config: &MEMCHECK_CONFIG --build-type=debug --sanitizers=address
+config: &CONFIG --build-type=release --enable-static -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
+memcheck_config: &MEMCHECK_CONFIG --build-type=debug --sanitizers=address -D FETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON
 
 resources_template: &RESOURCES_TEMPLATE
   cpu: *CPUS
@@ -161,18 +161,15 @@ alpine_task:
   << : *CI_TEMPLATE
   << : *UNIX_ENV
 
-# Apple doesn't publish official long-term support timelines.
-# We aim to support both the current and previous macOS release.
+# Cirrus only supports the following macos runner currently, selecting
+# anything else automatically upgrades to this one.
+#
+#    ghcr.io/cirruslabs/macos-runner:sonoma
+#
+# See also: https://cirrus-ci.org/guide/macOS/
 macos_sonoma_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-base:latest
-  prepare_script: ./ci/macos/prepare.sh
-  << : *CI_TEMPLATE
-  << : *MACOS_RESOURCES_TEMPLATE
-
-macos_ventura_task:
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-base:latest
+    image: ghcr.io/cirruslabs/macos-runner:sonoma
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_RESOURCES_TEMPLATE
diff --git a/cmake b/cmake
index 690483f7..2d42baf8 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 690483f76c149ffa8e035b612b406b0964f9886f
+Subproject commit 2d42baf8e63a7494224aa9d02afa2cb43ddb96b8