diff --git a/.github/workflows/ci-freebsd.yml b/.github/workflows/ci-freebsd.yml
index b2c0c5f76..991cae7ff 100644
--- a/.github/workflows/ci-freebsd.yml
+++ b/.github/workflows/ci-freebsd.yml
@@ -20,58 +20,19 @@ env:
   FREEBSD_CLANG_VERSION: 19
 
 jobs:
-  setup-matrix:
-    name: Setup Build Matrix
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.generate-matrix.outputs.matrix }}
-    permissions: {}
-    steps:
-      - name: Generate Matrix
-        id: generate-matrix
-        shell: bash
-        run: |
-          # Base matrix with amd64 build
-          matrix='{
-            "include": [
-              {
-                "bsd_release": "15.1",
-                "arch": "x86_64",
-                "cmake_processor": "amd64",
-                "runner": "ubuntu-latest"
-              }
-            ]
-          }'
-
-          # Add aarch64 build only if not a pull request event
-          if [[ "${{ github.event_name }}" != "pull_request" ]]; then
-            matrix=$(echo "$matrix" | jq '.include += [{
-              "bsd_release": "15.1",
-              "arch": "aarch64",
-              "cmake_processor": "aarch64",
-              "runner": "ubuntu-latest"
-            }]')
-          fi
-
-          # Use heredoc for multiline JSON output
-          {
-            echo "matrix<<EOF"
-            echo "$matrix"
-            echo "EOF"
-          } >> "${GITHUB_OUTPUT}"
-
-          echo "Generated matrix:"
-          echo "$matrix" | jq .
-
   build_freebsd:
     name: ${{ matrix.cmake_processor }}
-    runs-on: ubuntu-latest
-    needs: setup-matrix
+    runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
+      matrix:
+        include:
+          - bsd_release: '15.1'
+            arch: x86_64
+            cmake_processor: amd64
+            runner: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a98c342b6..0ce379dd0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -202,68 +202,41 @@ jobs:
         include:
           - name: FreeBSD-amd64
             coverage: true
-            pr: true
-          - name: FreeBSD-aarch64
-            coverage: true
-            pr: false
           - name: Linux-AppImage
             coverage: true
-            pr: true
           - name: Archlinux
             coverage: true
-            pr: true
           - name: macOS-arm64
             coverage: true
-            pr: true
           - name: macOS-x86_64
             coverage: true
-            pr: true
           - name: Homebrew-macos-14
             coverage: true
             coverage_file: coverage.lcov
-            pr: true
           - name: Homebrew-macos-15
             coverage: true
             coverage_file: coverage.lcov
-            pr: true
           - name: Homebrew-macos-26
             coverage: true
             coverage_file: coverage.lcov
-            pr: true
           - name: Homebrew-ubuntu-24.04
             coverage: true
-            pr: true
           - name: Windows-AMD64
             coverage: true
-            pr: true
           - name: Windows-ARM64
             coverage: true
-            pr: true
     steps:
-      - name: Should run
-        id: should_run
-        run: |
-          should_run="false"
-          if [ "${GITHUB_EVENT_NAME}" != "pull_request" ] || [ ${{ matrix.pr }} == "true" ]; then
-            should_run="true"
-          fi
-          echo "SHOULD_RUN=${should_run}" >> "${GITHUB_OUTPUT}"
-
       - name: Checkout
-        if: steps.should_run.outputs.SHOULD_RUN == 'true'
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
 
       - name: Download coverage artifact
-        if: steps.should_run.outputs.SHOULD_RUN == 'true'
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           name: coverage-${{ matrix.name }}
           path: _coverage
 
       - name: Upload test coverage
-        if: |
-          steps.should_run.outputs.SHOULD_RUN == 'true'  &&
-          matrix.coverage != false
+        if: matrix.coverage != false
         uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
         with:
           disable_search: true
@@ -275,7 +248,6 @@ jobs:
           verbose: true
 
       - name: Upload test results
-        if: steps.should_run.outputs.SHOULD_RUN == 'true'
         uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
         with:
           disable_search: true