diff --git a/.actions/build-bsd b/.actions/build-bsd
index 66fc4e3b..4478140a 100755
--- a/.actions/build-bsd
+++ b/.actions/build-bsd
@@ -15,7 +15,7 @@ cat > "${MANIFEST}" <<- EOF
 image: ${IMAGE}
 packages:
   - cmake
-  - llvm
+  - llvm${LLVM:+%$LLVM}
   - pcsc-lite
 EOF
 
@@ -38,7 +38,7 @@ tasks:
       else
         SUDO=sudo
       fi
-      SCAN="/usr/local/bin/scan-build --use-cc=/usr/bin/cc --status-bugs"
+      SCAN="/usr/local/bin/scan-build${LLVM:+-${LLVM}} --use-cc=/usr/bin/cc --status-bugs"
       cd libfido2
       for T in Debug Release; do
         mkdir build-\$T
diff --git a/.github/workflows/bsd_builds.yml b/.github/workflows/bsd_builds.yml
index 4208d486..ed2d7fb5 100644
--- a/.github/workflows/bsd_builds.yml
+++ b/.github/workflows/bsd_builds.yml
@@ -18,7 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: [freebsd/14.x, openbsd/7.4]
+        include:
+          - { image: freebsd/14.x, llvm: "" }
+          - { image: openbsd/7.4, llvm: 16 }
     steps:
     - uses: actions/checkout@v4
     - name: dependencies
@@ -27,6 +29,7 @@ jobs:
         sudo apt install -q -y curl jq
     - name: build
       env:
+        LLVM: ${{ matrix.llvm }}
         IMAGE: ${{ matrix.image }}
         SOURCEHUT_TOKEN: ${{ secrets.SOURCEHUT_TOKEN }}
       run: ./.actions/build-bsd