diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
new file mode 100644
index 00000000..ee689d74
--- /dev/null
+++ b/.github/ci/packages.apt
@@ -0,0 +1 @@
+libignition-cmake2-dev
diff --git a/.github/workflows/ci-bionic.yml b/.github/workflows/ci-bionic.yml
deleted file mode 100644
index 7c1d6f41..00000000
--- a/.github/workflows/ci-bionic.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Ubuntu Bionic CI
-
-on: [push, pull_request]
-
-jobs:
-  bionic-ci:
-    runs-on: ubuntu-latest
-    name: Ubuntu Bionic CI
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Bionic CI
-        id: ci
-        uses: ignition-tooling/ubuntu-bionic-ci-action@master
-        with:
-          apt-dependencies: 'libignition-cmake2-dev'
-          codecov-token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..5d9be4dd
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,27 @@
+name: Ubuntu CI
+
+on: [push]
+
+jobs:
+  bionic-ci:
+    runs-on: ubuntu-latest
+    name: Ubuntu Bionic CI
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Compile and test
+        id: ci
+        uses: ignition-tooling/action-ignition-ci@master
+        with:
+          codecov-token: ${{ secrets.CODECOV_TOKEN }}
+  focal-ci:
+    runs-on: ubuntu-latest
+    name: Ubuntu Focal CI
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Compile and test
+        id: ci
+        uses: ignition-tooling/action-ignition-ci@focal
+        with:
+          codecov-token: ${{ secrets.CODECOV_TOKEN }}