diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
index fac54d19..2aa8606c 100644
--- a/.github/workflows/ci-coverage-build.yml
+++ b/.github/workflows/ci-coverage-build.yml
@@ -15,4 +15,4 @@ jobs:
     secrets: inherit
     with:
       ros_distro: rolling
-      os_name: ubuntu-22.04
+      container: ubuntu:24.04
diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml
index b0f523d6..adb6694b 100644
--- a/.github/workflows/ci-pre-commit.yml
+++ b/.github/workflows/ci-pre-commit.yml
@@ -12,7 +12,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron, humble]
+        ROS_DISTRO: [iron, humble]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       os_name: ubuntu-22.04
+
+  pre-commit-rolling:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
+    with:
+      ros_distro: rolling
+      container: ubuntu:24.04
diff --git a/.github/workflows/source-build.yml b/.github/workflows/source-build.yml
index d228992a..0ec32c79 100644
--- a/.github/workflows/source-build.yml
+++ b/.github/workflows/source-build.yml
@@ -14,8 +14,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron, humble]
+        ROS_DISTRO: [iron, humble]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: master
       ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
+      os_name: ubuntu-22.04
+  source-rolling:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
+    strategy:
+      fail-fast: false
+      matrix:
+        ROS_DISTRO: [rolling]
+    with:
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ref: master
+      ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
+      container: ubuntu:24.04