diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
index 8df3408a5a..f0ff94ce66 100644
--- a/.github/workflows/build_tests.yml
+++ b/.github/workflows/build_tests.yml
@@ -11,7 +11,13 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-bionic:2020-03-16
+    strategy:
+      matrix:
+        container: [
+          "px4io/px4-dev-base-bionic:2020-03-28",
+          "px4io/px4-dev-base-focal:2020-03-28"
+          ]
+    container: ${{ matrix.container }}
     steps:
     - uses: actions/checkout@v1
       with: