diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 87f296b6..9c1733b0 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   compatibility:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     container: streamhpc/opencl-sdk-base:ubuntu-18.04-20220127
     strategy:
       matrix:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 4e4092f2..fa790349 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -24,6 +24,10 @@ jobs:
         # Install Ninja only if it's the selected generator and it's not available.
         cmake --version
 
+    - name: Install gcc if required
+      run: |
+        if [[ ! `which /usr/local/bin/gcc-${{matrix.VER}}` ]]; then brew install gcc@${{matrix.VER}}; fi;
+
     - name: Configure CMake
       shell: bash
       run: cmake