diff --git a/.github/workflows/NetBSD-9.3-Makefile.yml b/.github/workflows/NetBSD-Makefile.yml
similarity index 59%
rename from .github/workflows/NetBSD-9.3-Makefile.yml
rename to .github/workflows/NetBSD-Makefile.yml
index f4aa4711054..4b68fe9f829 100644
--- a/.github/workflows/NetBSD-9.3-Makefile.yml
+++ b/.github/workflows/NetBSD-Makefile.yml
@@ -1,4 +1,4 @@
-name: NetBSD 9.3 Makefile
+name: NetBSD Makefile
 
 on:
   push:
@@ -6,13 +6,20 @@ on:
   pull_request:
     branches: [ master ]
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - { version: 9.3, deps: sys   }
+          - { version: 9.3, deps: local }
+          - { version: 9.3, deps: small }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
     runs-on: ubuntu-22.04
 
     steps:
@@ -25,7 +32,7 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
@@ -37,7 +44,7 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
@@ -56,12 +63,12 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -69,12 +76,12 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
+          gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -82,7 +89,7 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: netbsd
-        version: '9.3'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: true
diff --git a/.github/workflows/OpenBSD-7.4-Makefile.yml b/.github/workflows/OpenBSD-Makefile.yml
similarity index 55%
rename from .github/workflows/OpenBSD-7.4-Makefile.yml
rename to .github/workflows/OpenBSD-Makefile.yml
index e556a50a60d..6326977f813 100644
--- a/.github/workflows/OpenBSD-7.4-Makefile.yml
+++ b/.github/workflows/OpenBSD-Makefile.yml
@@ -1,4 +1,4 @@
-name: OpenBSD 7.4 Makefile
+name: OpenBSD Makefile
 
 on:
   push:
@@ -6,13 +6,20 @@ on:
   pull_request:
     branches: [ master ]
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - { version: 7.4, deps: sys   }
+          - { version: 7.4, deps: local }
+          - { version: 7.4, deps: small }
+
+    concurrency:
+      group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
+      cancel-in-progress: true
+
     runs-on: ubuntu-22.04
 
     steps:
@@ -25,7 +32,7 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
@@ -37,7 +44,7 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
@@ -50,12 +57,12 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -63,12 +70,12 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
-          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
       uses: cross-platform-actions/action@v0.23.0
       with:
@@ -76,7 +83,7 @@ jobs:
         hypervisor: qemu
         memory: 4G
         operating_system: openbsd
-        version: '7.4'
+        version: ${{matrix.version}}
         shell: bash
         sync_files: false
         shutdown_vm: true