diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a928f84..cbd9c62 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,36 +33,34 @@ jobs:
         id: cpu-cores
 
       - name: (MacOS) Install dependencies
-        if: matrix.config.os == 'macOS'
+        if: contains(matrix.config.os, 'macos')
         run: |
           brew update
           brew install cmake boost zlib rapidjson libomp
           pip3 install click tqdm
 
-      - name: (Linux GCC) Install dependencies
-        if: (matrix.config.os == 'Linux') && (matrix.config.compiler == 'gcc')
+      - name: (Linux) Install dependencies
+        if: contains(matrix.config.os, 'ubuntu')
         run: | 
-          sudo apt-get update
-          sudo apt-get install -yq build-essential cmake libboost-dev libboost-serialization-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev zlib1g-dev rapidjson-dev libquadmath0 python3-pip
+          sudo apt update
+          sudo apt install -yq build-essential cmake libboost-dev libboost-serialization-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev zlib1g-dev rapidjson-dev libquadmath0 python3-pip
           pip3 install click tqdm
 
-      - name: (Linux Clang) Install dependencies
-        if: (matrix.config.os == 'Linux') && (matrix.config.compiler == 'clang')
+      - name: (Linux) Install Clang
+        if: contains(matrix.config.os, 'ubuntu') && (matrix.config.compiler == 'clang')
         run: | 
-          sudo apt-get update
-          sudo apt-get install -yq build-essential cmake libboost-dev libboost-serialization-dev libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev zlib1g-dev rapidjson-dev libquadmath0 python3-pip clang++
-          pip3 install click tqdm
+          sudo apt install clang++
 
       - name: (MacOS) Configure CMake
-        if: matrix.config.os == 'macOS'
+        if: contains(matrix.config.os, 'macos')
         run: cmake -DCMAKE_CXX_FLAGS="-L/usr/local/opt/libomp/lib -I/usr/local/opt/libomp/include" -DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I/usr/local/opt/libomp/include" -DOpenMP_CXX_LIB_NAMES="omp" -DOpenMP_omp_LIBRARY="/usr/local/opt/libomp/lib/libomp.dylib" -B ${{runner.workspace}}/bin -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
       - name: (Linux GCC) Configure CMake
-        if: (matrix.config.os == 'Linux') && (matrix.config.compiler == 'gcc')
+        if: contains(matrix.config.os, 'ubuntu') && (matrix.config.compiler == 'gcc')
         run: cmake -B ${{runner.workspace}}/bin -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
       - name: (Linux Clang) Configure CMake
-        if: (matrix.config.os == 'Linux') && (matrix.config.compiler == 'clang')
+        if: contains(matrix.config.os, 'ubuntu') && (matrix.config.compiler == 'clang')
         run: cmake -B ${{runner.workspace}}/bin -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DC_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
 
       - name: Build