diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b93dc0b..9340fc6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -155,8 +155,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { host: "macos-12", os: "freebsd", osver: "13.1", cc: "clang", arch: "x86-64", build_type: "Release", defs: "ASMJIT_TEST=ON" }
-          - { host: "macos-12", os: "openbsd", osver: "7.2" , cc: "clang", arch: "x86-64", build_type: "Release", defs: "ASMJIT_TEST=ON" }
+          - { host: "macos-12"     , os: "freebsd", osver: "13.1", cc: "clang", arch: "x86-64", build_type: "Release", defs: "ASMJIT_TEST=ON" }
+          - { host: "macos-12"     , os: "netbsd" , osver: "9.2" , cc: "clang", arch: "x86-64", build_type: "Release", defs: "ASMJIT_TEST=ON" }
+          - { host: "macos-12"     , os: "openbsd", osver: "7.2" , cc: "clang", arch: "x86-64", build_type: "Release", defs: "ASMJIT_TEST=ON" }
+          - { host: "ubuntu-latest", os: "openbsd", osver: "7.2" , cc: "clang", arch: "arm64" , build_type: "Release", defs: "ASMJIT_TEST=ON" }
 
     name: "${{matrix.os}}-${{matrix.osver}} (${{matrix.cc}}, ${{matrix.arch}}, ${{matrix.build_type}})"
     runs-on: ${{matrix.host}}
@@ -184,7 +186,10 @@ jobs:
             set -e
 
             PATH="/usr/sbin:/usr/pkg/sbin:/usr/pkg/bin:$PATH:$(pwd)/build-actions"
+            CI_NETBSD_USE_PKGIN=1
+
             export PATH
+            export CI_NETBSD_USE_PKGIN
 
             sh ./build-actions/prepare-environment.sh
             python3 build-actions/action.py                       \
@@ -195,47 +200,3 @@ jobs:
               --config=source/.github/workflows/build-config.json \
               --build-type=${{matrix.build_type}}                 \
               --build-defs=${{matrix.defs}}
-
-  build-netbsd:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { title: "netbsd", host: "macos-12", os: "netbsd", cc: "clang", arch: "x86_64", build_type: "Release", defs: "ASMJIT_TEST=ON" }
-
-    name: "${{matrix.title}} (${{matrix.cc}}, ${{matrix.arch}}, ${{matrix.build_type}})"
-    runs-on: ${{matrix.host}}
-
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v3
-        with:
-          path: "source"
-
-      - name: "Checkout Build Actions"
-        uses: actions/checkout@v3
-        with:
-          repository: build-actions/build-actions
-          path: "build-actions"
-
-      - name: Build & Test (VM)
-        uses: vmactions/netbsd-vm@v0
-        with:
-          mem: 6144
-          usesh: true
-          copyback: false
-          run: |
-            set -e
-
-            PATH="/usr/sbin:/usr/pkg/sbin:/usr/pkg/bin:$PATH:$(pwd)/build-actions"
-            export PATH
-
-            bash ./build-actions/prepare-environment.sh
-            python3 ./build-actions/action.py                     \
-              --step=all                                          \
-              --compiler=${{matrix.cc}}                           \
-              --architecture=${{matrix.arch}}                     \
-              --source-dir=source                                 \
-              --config=source/.github/workflows/build-config.json \
-              --build-type=${{matrix.build_type}}                 \
-              --build-defs=${{matrix.defs}}
diff --git a/src/asmjit/core.h b/src/asmjit/core.h
index 1511cb6..e586734 100644
--- a/src/asmjit/core.h
+++ b/src/asmjit/core.h
@@ -120,9 +120,13 @@ namespace asmjit {
 //!
 //!   - Tested:
 //!
-//!     - **Linux** - Tested by GitHub Actions (any distribution is generally supported, CI uses Ubuntu images).
+//!     - **BSD** - FreeBSD, NetBSD, and OpenBSD tested by GitHub Actions (only recent images are tested by CI). BSD
+//!       runners only test BSD images with clang compiler.
 //!
-//!     - **Mac OS** - Tested by GitHub Actions (any version is supported).
+//!     - **Linux** - Tested by GitHub Actions (only recent Ubuntu images are tested by CI, in general any distribution
+//!       should be supported as AsmJit has no dependencies).
+//!
+//!     - **Mac OS** - Tested by GitHub Actions.
 //!
 //!     - **Windows** - Tested by GitHub Actions - (Windows 7+ is officially supported).
 //!
@@ -131,8 +135,6 @@ namespace asmjit {
 //!
 //!   - Untested:
 //!
-//!     - **BSDs** - No maintainers, no CI environment to regularly test BSDs, but they should work out of box.
-//!
 //!     - **Haiku** - Reported to work, not tested by CI.
 //!
 //!     - **Other** operating systems would require some testing and support in the following files: