diff --git a/.github/workflows/humble-ci-pre-commit.yml b/.github/workflows/humble-ci-pre-commit.yml
index 039c0a8..e197f70 100644
--- a/.github/workflows/humble-ci-pre-commit.yml
+++ b/.github/workflows/humble-ci-pre-commit.yml
@@ -9,10 +9,5 @@ on:
 jobs:
   pre-commit:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [humble]
     with:
-      ros_distro: ${{ matrix.ROS_DISTRO }}
-      os_name: ubuntu-22.04
+      ros_distro: humble
diff --git a/.github/workflows/rolling-build.yml b/.github/workflows/rolling-build.yml
index 7e39d44..411a9f3 100644
--- a/.github/workflows/rolling-build.yml
+++ b/.github/workflows/rolling-build.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        ROS_DISTRO: [iron, jazzy, rolling]
         ROS_REPO: [main, testing]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml
similarity index 82%
rename from .github/workflows/ci-pre-commit.yml
rename to .github/workflows/rolling-pre-commit.yml
index cbb4c5c..9f70d2f 100644
--- a/.github/workflows/ci-pre-commit.yml
+++ b/.github/workflows/rolling-pre-commit.yml
@@ -12,7 +12,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron]
+        ROS_DISTRO: [iron, jazzy, rolling]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
-      os_name: ubuntu-22.04
diff --git a/README.md b/README.md
index ce4a082..79701e1 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ See [control_msgs documentation](https://index.ros.org/p/control_msgs/) on index
 | Noetic       | [kinetic-devel](https://github.com/ros-controls/control_msgs/tree/kinetic-devel) | [Build status](https://travis-ci.org/ros-controls/control_msgs) |
 | Humble      | [humble](https://github.com/ros-controls/control_msgs/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml) |
 | Iron     | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
+| Jazzy     | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
 | Rolling     | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
 
 ## Code Formatting