diff --git a/.github/scripts/cmake-osx b/.github/scripts/cmake-osx
index 7cf6edebe..ac14f362f 100755
--- a/.github/scripts/cmake-osx
+++ b/.github/scripts/cmake-osx
@@ -23,6 +23,11 @@ add_flag -Werror
 # C99-only compilers we test against anyway. Anything that passes all the
 # compilers we use is fine.
 add_c_flag -Wno-c11-extensions
+add_c_flag -Wno-pre-c11-compat
+
+# TODO(iphydf): Investigate if we can get lan discovery to work on macos CI.
+# It works, but CI doesn't let us press the "allow broadcast" button.
+sed -Ei -e '/\((lan_discovery)\)/s/^/#/' auto_tests/CMakeLists.txt
 
 cmake -B_build -H. \
   -DCMAKE_C_FLAGS="$C_FLAGS" \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 332cf43cc..10b3b9d64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,12 +116,12 @@ jobs:
               libopus
               libsodium
               libvpx
-              ninja
+              ninja-build
               pkg-config
 
           run: |
             # TODO(iphydf): Investigate NetBSD failures on these tests.
-            sed -Ei -e '/\((TCP|dht_nodes_response_api)\)/s/^/#/' auto_tests/CMakeLists.txt
+            sed -Ei -e '/\((TCP|dht_nodes_response_api|tcp_relay)\)/s/^/#/' auto_tests/CMakeLists.txt
             cmake . \
               -DMIN_LOGGER_LEVEL=TRACE \
               -DMUST_BUILD_TOXAV=ON \
diff --git a/other/docker/goblint/goblint.Dockerfile b/other/docker/goblint/goblint.Dockerfile
index 77713f4ff..90941525a 100644
--- a/other/docker/goblint/goblint.Dockerfile
+++ b/other/docker/goblint/goblint.Dockerfile
@@ -1,5 +1,5 @@
 FROM toxchat/c-toxcore:sources AS sources
-FROM ghcr.io/goblint/analyzer:latest
+FROM ghcr.io/goblint/analyzer:2.5.0
 
 RUN apt-get update && \
  DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \