diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 8667f476..a84ef4f7 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -23,9 +23,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [focal, jammy]
+        include:
+          - os: focal
+            distro: foxy
+          - os: jammy
+            distro: humble
     container:
-      image: ubuntu:${{ matrix.distro }}
+      image: ros:${{ matrix.distro }}
       env:
         CCACHE_DIR: ${{ github.workspace }}/${{ matrix.distro }}/.ccache
         DEBIAN_FRONTEND: noninteractive
@@ -39,6 +43,7 @@ jobs:
       - name: Build and Tests
         uses: tesseract-robotics/colcon-action@v5
         with:
+          before-script: source /opt/ros/${{ matrix.distro }}/setup.bash
           ccache-prefix: ${{ matrix.distro }}
           vcs-file: dependencies.repos
           ros-enabled: true