diff --git a/.github/workflows/ros_ci.yml b/.github/workflows/ros_ci.yml
index 6d7e13a7df488e98394b2b9c9c59105c7c2a3f52..e14133b46bdb78b37dbf84a7262785b0f328e81e 100644
--- a/.github/workflows/ros_ci.yml
+++ b/.github/workflows/ros_ci.yml
@@ -11,14 +11,16 @@ jobs:
     strategy:
       matrix:
         env:
-          - {ROS_DISTRO: melodic}
-          - {ROS_DISTRO: noetic, BUILDER: catkin_tools}
+          - {ROS_DISTRO: melodic, PRERELEASE: false}
+          - {ROS_DISTRO: noetic}
           - {ROS_DISTRO: foxy}
           - {ROS_DISTRO: galactic}
-          - {ROS_DISTRO: foxy, PRERELEASE: true}
-          - {ROS_DISTRO: galactic, PRERELEASE: true}
+          - {ROS_DISTRO: rolling}
+          - {ROS_DISTRO: humble}
     env:
       CCACHE_DIR: /github/home/.ccache # Enable ccache
+      PRERELEASE: true
+      BUILDER: colcon
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2