diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index 5d27d520..b342eb46 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -1,8 +1,13 @@
 name: macOS Latest Build
-on: [push, pull_request]
+#on: [push, pull_request]
+on: workflow_dispatch
 
 jobs:
   build:
+    strategy:
+      matrix:
+        cmake_build: ['-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Debug']
+        cmake_options: ['', '-DENABLE_LINK=OFF', '-DENABLE_SDL=ON']
     runs-on: macos-latest
 
     steps:
@@ -17,7 +22,7 @@ jobs:
 
       - name: Configure
         run: >-
-          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+          cmake -B build -G Ninja ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
 
       - name: Build
         run: ninja -C build
diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml
index 6283d3cf..805fcf9b 100644
--- a/.github/workflows/msys2-build.yml
+++ b/.github/workflows/msys2-build.yml
@@ -1,41 +1,37 @@
-name: MSYS2 Build
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: windows-latest
-    env:
-      MSYSTEM: CLANG64
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v2
-        with: 
-          submodules: recursive
-      - name: Setup msys2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: CLANG64
-          update: true
-          install: >-
-            mingw-w64-clang-x86_64-toolchain
-            mingw-w64-clang-x86_64-pkgconf
-            mingw-w64-clang-x86_64-ffmpeg
-            mingw-w64-clang-x86_64-FAudio
-            mingw-w64-clang-x86_64-cmake
-            mingw-w64-clang-x86_64-ninja
-            mingw-w64-clang-x86_64-wxWidgets3.2
-            mingw-w64-clang-x86_64-sfml
-            mingw-w64-clang-x86_64-SDL2
-            zip
-      - name: Configure
-        run: >-
-          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DVBAM_STATIC=ON -DENABLE_SSP=ON -DENABLE_ONLINEUPDATES=OFF
-      - name: Build
-        run: ninja -C build
-
-      - name: Install
-        run: ninja -C build install
\ No newline at end of file
+name: MSYS2 Build
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        cmake_build: ['-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Debug']
+        cmake_options: ['', '-DENABLE_LINK=OFF', '-DENABLE_SDL=ON']
+    runs-on: windows-latest
+    env:
+      MSYSTEM: CLANG64
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v2
+        with: 
+          submodules: recursive
+      - name: Setup msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANG64
+          update: true
+      - name: Install deps
+        run: >-
+          bash installdeps
+      - name: Configure
+        run: >-
+          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
+      - name: Build
+        run: ninja -C build
+
+      - name: Install
+        run: ninja -C build install
diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
index 319268f0..3e27b99f 100644
--- a/.github/workflows/ubuntu-build.yml
+++ b/.github/workflows/ubuntu-build.yml
@@ -3,8 +3,12 @@ on: [push, pull_request]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        cmake_compiler: ['-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++', '-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++']
+        cmake_build: ['-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Debug']
+        cmake_options: ['', '-DENABLE_LINK=OFF', '-DENABLE_SDL=ON']
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout the code
         uses: actions/checkout@v2
@@ -13,11 +17,11 @@ jobs:
 
       - name: Install Dependencies
         run: >-
-          bash installdeps
+          bash installdeps; if [ "${{ matrix.compiler }}" = clang ]; then sudo apt -y install clang; fi
 
       - name: Configure
         run: >-
-          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+          cmake -B build -G Ninja ${{ matrix.cmake_compiler }} ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
 
       - name: Build
         run: ninja -C build