diff --git a/.github/workflows/build-binary.yml b/.github/workflows/build-binary.yml
index 657a179..c6df887 100644
--- a/.github/workflows/build-binary.yml
+++ b/.github/workflows/build-binary.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron, humble]
+        ROS_DISTRO: [rolling, jazzy, iron, humble]
         ROS_REPO: [main, testing]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
diff --git a/.github/workflows/build-source.yml b/.github/workflows/build-source.yml
index 50b33e0..7033cea 100644
--- a/.github/workflows/build-source.yml
+++ b/.github/workflows/build-source.yml
@@ -21,6 +21,9 @@ jobs:
         - ROS_DISTRO: iron
           CONTAINER: ""
           OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: jazzy
+          CONTAINER: ubuntu:24.04
+          OS_NAME: ubuntu-latest
         - ROS_DISTRO: rolling
           CONTAINER: ubuntu:24.04
           OS_NAME: ubuntu-latest
diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml
index ae9e858..20387d2 100644
--- a/.github/workflows/ci-pre-commit.yml
+++ b/.github/workflows/ci-pre-commit.yml
@@ -17,6 +17,9 @@ jobs:
         - ROS_DISTRO: iron
           CONTAINER: ""
           OS_NAME: ubuntu-22.04
+        - ROS_DISTRO: jazzy
+          CONTAINER: ubuntu:24.04
+          OS_NAME: ubuntu-latest
         - ROS_DISTRO: rolling
           CONTAINER: ubuntu:24.04
           OS_NAME: ubuntu-latest
diff --git a/.github/workflows/debian-build.yml b/.github/workflows/debian-build.yml
index ff3e5f6..c768c33 100644
--- a/.github/workflows/debian-build.yml
+++ b/.github/workflows/debian-build.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron, humble]
+        ROS_DISTRO: [rolling, jazzy, iron, humble]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
diff --git a/.github/workflows/rhel-semi-binary-build.yml b/.github/workflows/rhel-semi-binary-build.yml
index ce84552..ebf05ed 100644
--- a/.github/workflows/rhel-semi-binary-build.yml
+++ b/.github/workflows/rhel-semi-binary-build.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron, humble]
+        ROS_DISTRO: [rolling, jazzy, iron, humble]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
diff --git a/README.md b/README.md
index 846c4a7..5e6880c 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ See the documentation of [ros2_control](http://control.ros.org) and release info
 ROS2 Distro | Branch | Build status | Documentation | Released packages
 :---------: | :----: | :----------: | :-----------: | :---------------:
 **Rolling** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Binary Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml?branch=ros2-master) <br /> [![Rolling Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml/badge.svg?branch=ros2-master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml?branch=ros2-master) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/)  | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling)
+**Jazzy** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | see above | [API](http://docs.ros.org/en/jazzy/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#jazzy)
 **Iron** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | see above | [API](http://docs.ros.org/en/iron/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#iron)
 **Humble** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | see above | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble)