diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
new file mode 100644
index 00000000..cbefb734
--- /dev/null
+++ b/.github/ci/packages.apt
@@ -0,0 +1,8 @@
+libignition-cmake2-dev
+libignition-math6-dev
+libignition-tools-dev
+libprotobuf-dev
+libprotoc-dev
+libtinyxml2-dev
+protobuf-compiler
+ruby
diff --git a/.github/workflows/ci-bionic.yml b/.github/workflows/ci-bionic.yml
index 49ec2cb8..5d9be4dd 100644
--- a/.github/workflows/ci-bionic.yml
+++ b/.github/workflows/ci-bionic.yml
@@ -1,6 +1,6 @@
-name: Ubuntu Bionic CI
+name: Ubuntu CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   bionic-ci:
@@ -9,9 +9,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Bionic CI
+      - name: Compile and test
         id: ci
-        uses: ignition-tooling/ubuntu-bionic-ci-action@master
+        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:
-          apt-dependencies: 'libprotobuf-dev protobuf-compiler libprotoc-dev ruby libtinyxml2-dev libignition-cmake2-dev libignition-tools-dev libignition-math6-dev'
           codecov-token: ${{ secrets.CODECOV_TOKEN }}