diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index aedd937d..193744e7 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -69,15 +69,35 @@ jobs:
             coverage: false
           }
         - {
-            name: "MacOS / Clang (Debug, Single Precision)",
-            os: macos-latest,
-            build_type: "Debug",
+            name: "Linux / Clang (Release, Single Precision)",
+            os: ubuntu-latest,
+            build_type: "Release",
             cc: "clang",
             cxx: "clang++",
             generators: "Ninja",
             double_precision: false,
             coverage: false
           }
+        - {
+            name: "Linux / Clang (Debug, Double Precision)",
+            os: ubuntu-latest,
+            build_type: "Debug",
+            cc: "clang",
+            cxx: "clang++",
+            generators: "Ninja",
+            double_precision: true,
+            coverage: false
+          }
+        - {
+            name: "Linux / Clang (Release, Double Precision)",
+            os: ubuntu-latest,
+            build_type: "Release",
+            cc: "clang",
+            cxx: "clang++",
+            generators: "Ninja",
+            double_precision: true,
+            coverage: false
+          }
         - {
             name: "Windows / MSVC (Debug, Single Precision)",
             os: windows-latest,
@@ -98,26 +118,6 @@ jobs:
             double_precision: false,
             coverage: false
           }
-        - {
-            name: "Windows / MSVC (Debug, Double Precision)",
-            os: windows-latest,
-            build_type: "Debug",
-            cc: "cl",
-            cxx: "cl",
-            generators: "Visual Studio 16 2019",
-            double_precision: true,
-            coverage: false
-          }
-        - {
-            name: "Windows / MSVC (Release, Double Precision)",
-            os: windows-latest,
-            build_type: "Release",
-            cc: "cl",
-            cxx: "cl",
-            generators: "Visual Studio 16 2019",
-            double_precision: true,
-            coverage: false
-          }
         - {
             name: "Windows / MinGW (Debug, Single Precision)",
             os: windows-latest,
@@ -139,23 +139,13 @@ jobs:
             coverage: false
           }
         - {
-            name: "Windows / MinGW (Debug, Double Precision)",
-            os: windows-latest,
+            name: "MacOS / Clang (Debug, Single Precision)",
+            os: macos-latest,
             build_type: "Debug",
-            cc: "gcc",
-            cxx: "g++",
+            cc: "clang",
+            cxx: "clang++",
             generators: "Ninja",
-            double_precision: true,
-            coverage: false
-          }
-        - {
-            name: "Windows / MinGW (Release, Double Precision)",
-            os: windows-latest,
-            build_type: "Release",
-            cc: "gcc",
-            cxx: "g++",
-            generators: "Ninja",
-            double_precision: true,
+            double_precision: false,
             coverage: false
           }
         - {
@@ -168,6 +158,16 @@ jobs:
             double_precision: false,
             coverage: false
           }
+        - {
+            name: "MacOS / GCC (Debug, Single Precision)",
+            os: macos-latest,
+            build_type: "Debug",
+            cc: "gcc",
+            cxx: "g++",
+            generators: "Ninja",
+            double_precision: false,
+            coverage: false
+          }
         - {
             name: "MacOS / GCC (Release, Single Precision)",
             os: macos-latest,
@@ -276,6 +276,9 @@ jobs:
 
       - name: Compute Code Coverage
         if: ${{ matrix.config.coverage }}
+        env:
+          CC: ${{ matrix.config.cc }}
+          CXX: ${{ matrix.config.cxx }}
         shell: bash
         run: |
           cmake --build build/ --target coverage