diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 0b3c716267..7a1345982f 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -9,18 +9,15 @@ on:
     - '*'
 
 jobs:
-  build_in_ubuntu_bionic:
+  build:
+    strategy:
+      matrix:
+        container: [
+          "px4io/px4-dev-base-bionic:2020-03-28",
+          "px4io/px4-dev-base-focal:2020-03-28"
+          ]
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-bionic:2020-03-28
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-    - name: make
-      run: make
-  build_in_ubuntu_focal:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2020-03-28
+    container: ${{ matrix.container }}
     steps:
     - uses: actions/checkout@v1
       with: