diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
index 463801e5..2aa8606c 100644
--- a/.github/workflows/ci-coverage-build.yml
+++ b/.github/workflows/ci-coverage-build.yml
@@ -11,8 +11,8 @@ on:
 jobs:
   coverage:
     name: coverage build
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@revert_coverage_hack
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
     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..500af4d9 100644
--- a/.github/workflows/ci-pre-commit.yml
+++ b/.github/workflows/ci-pre-commit.yml
@@ -8,11 +8,17 @@ on:
 
 jobs:
   pre-commit:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@revert_coverage_hack
     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@revert_coverage_hack
+    with:
+      ros_distro: rolling
+      container: ubuntu:24.04
diff --git a/.github/workflows/source-build.yml b/.github/workflows/source-build.yml
index d228992a..9c58f18b 100644
--- a/.github/workflows/source-build.yml
+++ b/.github/workflows/source-build.yml
@@ -4,18 +4,33 @@ on:
   push:
     branches:
       - master
+  pull_request:
+    branches:
+      - master
   schedule:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 3 * * *'
 
 jobs:
-  source:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
+  # source:
+  #   uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       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@revert_coverage_hack
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling, iron, humble]
+        ROS_DISTRO: [rolling]
     with:
       ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: master
       ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
+      container: ubuntu:24.04