diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d46c50c..50ad53b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,11 @@ on:
 jobs:
   test:
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        distro:
+          - ubuntu20
+          - ubuntu22
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -31,3 +36,6 @@ jobs:
         run: |
           molecule destroy
           molecule test
+        env:
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+
diff --git a/meta/main.yml b/meta/main.yml
index 50831c4..09429d5 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -11,6 +11,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - focal
         - jammy
   galaxy_tags:
     - potos
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8062c8b..b0af7a3 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,7 +8,7 @@ driver:
 
 platforms:
   - name: instance
-    image: ghcr.io/projectpotos/ubuntu22-ansible-test:latest
+    image: ghcr.io/projectpotos/${MOLECULE_DISTRO}-ansible-test:latest
     pre_build_image: yes
     command: /lib/systemd/systemd
     privileged: yes