diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml
new file mode 100644
index 0000000000..989805733f
--- /dev/null
+++ b/.github/workflows/humble-binary-build.yml
@@ -0,0 +1,27 @@
+name: Humble Binary Build
+# author: Denis Štogl <denis@stoglrobotics.de>
+# description: 'Build & test all dependencies from released (binary) packages.'
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  push:
+    branches:
+      - humble
+  schedule:
+    # Run every morning to detect flakiness and broken dependencies
+    - cron: '03 1 * * *'
+
+jobs:
+  binary:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_REPO: [main, testing]
+    with:
+      ros_distro: humble
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_controllers-not-released.humble.repos
+      ref_for_scheduled_build: humble
diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml
index e8deb2caa5..3a06c3fc37 100644
--- a/.github/workflows/humble-debian-build.yml
+++ b/.github/workflows/humble-debian-build.yml
@@ -12,19 +12,9 @@ on:
 jobs:
   humble_debian:
     name: Humble debian build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: humble
-    container: ghcr.io/ros-controls/ros:humble-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs
-          colcon test-result --verbose
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
+    with:
+      ros_distro: humble
+      upstream_workspace: ros2_controllers.humble.repos
+      ref_for_scheduled_build: humble
+      skip_packages: rqt_joint_trajectory_controller
diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml
deleted file mode 100644
index cd9b85b2e1..0000000000
--- a/.github/workflows/humble-rhel-binary-build.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: RHEL Humble Binary Build
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - humble
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 1 * * *'
-
-jobs:
-  humble_rhel_binary:
-    name: Humble RHEL binary build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: humble
-    container: ghcr.io/ros-controls/ros:humble-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_controllers || true
-      - name: Build and test
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build --packages-skip rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_joint_trajectory_controller
-          colcon test-result --verbose
diff --git a/.github/workflows/humble-rhel-semi-binary-build.yml b/.github/workflows/humble-rhel-semi-binary-build.yml
new file mode 100644
index 0000000000..ccf64a0246
--- /dev/null
+++ b/.github/workflows/humble-rhel-semi-binary-build.yml
@@ -0,0 +1,19 @@
+name: RHEL Humble Binary Build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '03 1 * * *'
+
+jobs:
+  humble_rhel_binary:
+    name: Humble RHEL binary build
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
+    with:
+      ros_distro: humble
+      upstream_workspace: ros2_controllers.humble.repos
+      ref_for_scheduled_build: humble
+      skip_packages: rqt_joint_trajectory_controller
diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
new file mode 100644
index 0000000000..1d9d3bd1fb
--- /dev/null
+++ b/.github/workflows/humble-semi-binary-build.yml
@@ -0,0 +1,26 @@
+name: Humble Semi-Binary Build
+# description: 'Build & test that compiles the main dependencies from source.'
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  push:
+    branches:
+      - humble
+  schedule:
+    # Run every morning to detect flakiness and broken dependencies
+    - cron: '33 1 * * *'
+
+jobs:
+  semi_binary:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_REPO: [main, testing]
+    with:
+      ros_distro: humble
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_controllers.humble.repos
+      ref_for_scheduled_build: humble
diff --git a/.github/workflows/humble-source-build.yml b/.github/workflows/humble-source-build.yml
new file mode 100644
index 0000000000..7b4427d6d6
--- /dev/null
+++ b/.github/workflows/humble-source-build.yml
@@ -0,0 +1,17 @@
+name: Humble Source Build
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - humble
+  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
+    with:
+      ros_distro: humble
+      ref: humble
+      ros2_repo_branch: humble
diff --git a/.github/workflows/iron-binary-build-testing.yml b/.github/workflows/iron-binary-build-testing.yml
deleted file mode 100644
index 25a693dc23..0000000000
--- a/.github/workflows/iron-binary-build-testing.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Iron Binary Build - testing
-# author: Denis Štogl <denis@stoglrobotics.de>
-# description: 'Build & test all dependencies from released (binary) packages.'
-
-on:
-  workflow_dispatch:
-    branches:
-      - iron
-      - '*feature*'
-      - '*feature/**'
-  pull_request:
-    branches:
-      - iron
-      - '*feature*'
-      - '*feature/**'
-  push:
-    branches:
-      - iron
-  schedule:
-    # Run every morning to detect flakiness and broken dependencies
-    - cron: '03 1 * * *'
-
-jobs:
-  binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
-    with:
-      ros_distro: iron
-      ros_repo: testing
-      upstream_workspace: ros2_controllers-not-released.iron.repos
-      ref_for_scheduled_build: iron
diff --git a/.github/workflows/iron-binary-build-main.yml b/.github/workflows/iron-binary-build.yml
similarity index 72%
rename from .github/workflows/iron-binary-build-main.yml
rename to .github/workflows/iron-binary-build.yml
index ef35397855..079620771c 100644
--- a/.github/workflows/iron-binary-build-main.yml
+++ b/.github/workflows/iron-binary-build.yml
@@ -1,4 +1,4 @@
-name: Iron Binary Build - main
+name: Iron Binary Build
 # author: Denis Štogl <denis@stoglrobotics.de>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -22,9 +22,12 @@ on:
 
 jobs:
   binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_REPO: [main, testing]
     with:
       ros_distro: iron
-      ros_repo: main
+      ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.iron.repos
       ref_for_scheduled_build: iron
diff --git a/.github/workflows/iron-debian-build.yml b/.github/workflows/iron-debian-build.yml
index 09dbd051b2..f3419c1a31 100644
--- a/.github/workflows/iron-debian-build.yml
+++ b/.github/workflows/iron-debian-build.yml
@@ -12,19 +12,9 @@ on:
 jobs:
   iron_debian:
     name: Iron debian build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: iron
-    container: ghcr.io/ros-controls/ros:iron-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs
-          colcon test-result --verbose
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
+    with:
+      ros_distro: iron
+      upstream_workspace: ros2_controllers.iron.repos
+      ref_for_scheduled_build: iron
+      skip_packages: rqt_joint_trajectory_controller
diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml
deleted file mode 100644
index 0eb28b9673..0000000000
--- a/.github/workflows/iron-rhel-binary-build.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: RHEL Iron Binary Build
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - iron
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 1 * * *'
-
-
-jobs:
-  iron_rhel_binary:
-    name: Iron RHEL binary build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: iron
-    container: ghcr.io/ros-controls/ros:iron-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_controllers || true
-      - name: Build and test
-      # source also underlay workspace with generate_parameter_library on rhel9
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
-          colcon build --packages-skip rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_joint_trajectory_controller
-          colcon test-result --verbose
diff --git a/.github/workflows/iron-rhel-semi-binary-build.yml b/.github/workflows/iron-rhel-semi-binary-build.yml
new file mode 100644
index 0000000000..66ad427a98
--- /dev/null
+++ b/.github/workflows/iron-rhel-semi-binary-build.yml
@@ -0,0 +1,20 @@
+name: RHEL Iron Binary Build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - iron
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '03 1 * * *'
+
+
+jobs:
+  iron_rhel_binary:
+    name: Iron RHEL binary build
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
+    with:
+      ros_distro: iron
+      upstream_workspace: ros2_controllers.iron.repos
+      ref_for_scheduled_build: iron
+      skip_packages: rqt_joint_trajectory_controller
diff --git a/.github/workflows/iron-semi-binary-build-testing.yml b/.github/workflows/iron-semi-binary-build-testing.yml
deleted file mode 100644
index c5ff430c89..0000000000
--- a/.github/workflows/iron-semi-binary-build-testing.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Iron Semi-Binary Build - testing
-# description: 'Build & test that compiles the main dependencies from source.'
-
-on:
-  workflow_dispatch:
-    branches:
-      - iron
-      - '*feature*'
-      - '*feature/**'
-  pull_request:
-    branches:
-      - iron
-      - '*feature*'
-      - '*feature/**'
-  push:
-    branches:
-      - iron
-  schedule:
-    # Run every morning to detect flakiness and broken dependencies
-    - cron: '33 1 * * *'
-
-jobs:
-  semi_binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
-    with:
-      ros_distro: iron
-      ros_repo: testing
-      upstream_workspace: ros2_controllers.iron.repos
-      ref_for_scheduled_build: iron
diff --git a/.github/workflows/iron-semi-binary-build-main.yml b/.github/workflows/iron-semi-binary-build.yml
similarity index 70%
rename from .github/workflows/iron-semi-binary-build-main.yml
rename to .github/workflows/iron-semi-binary-build.yml
index 2224a59f0e..064be40555 100644
--- a/.github/workflows/iron-semi-binary-build-main.yml
+++ b/.github/workflows/iron-semi-binary-build.yml
@@ -1,4 +1,4 @@
-name: Iron Semi-Binary Build - main
+name: Iron Semi-Binary Build
 # description: 'Build & test that compiles the main dependencies from source.'
 
 on:
@@ -21,9 +21,12 @@ on:
 
 jobs:
   semi_binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_REPO: [main, testing]
     with:
       ros_distro: iron
-      ros_repo: main
+      ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers.iron.repos
       ref_for_scheduled_build: iron
diff --git a/.github/workflows/iron-source-build.yml b/.github/workflows/iron-source-build.yml
index 1e9d865c49..b27adb1d50 100644
--- a/.github/workflows/iron-source-build.yml
+++ b/.github/workflows/iron-source-build.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   source:
-    uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
     with:
       ros_distro: iron
       ref: iron
diff --git a/.github/workflows/reusable-industrial-ci-with-cache.yml b/.github/workflows/reusable-industrial-ci-with-cache.yml
deleted file mode 100644
index acefeebfac..0000000000
--- a/.github/workflows/reusable-industrial-ci-with-cache.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-name: Reusable industrial_ci Workflow with Cache
-# Reusable action to simplify dealing with ROS/ROS2 industrial_ci builds with cache
-# author: Denis Štogl <denis@stoglrobotics.de>
-
-on:
-  workflow_call:
-    inputs:
-      ref_for_scheduled_build:
-        description: 'Reference on which the repo should be checkout for scheduled build. Usually is this name of a branch or a tag.'
-        default: ''
-        required: false
-        type: string
-
-      upstream_workspace:
-        description: 'UPSTREAM_WORKSPACE variable for industrial_ci. Usually path to local .repos file.'
-        required: true
-        type: string
-      ros_distro:
-        description: 'ROS_DISTRO variable for industrial_ci'
-        required: true
-        type: string
-      ros_repo:
-        description: 'ROS_REPO to run for industrial_ci. Possible values: "main", "testing"'
-        default: 'main'
-        required: false
-        type: string
-      os_code_name:
-        description: 'OS_CODE_NAME variable for industrial_ci'
-        default: ''
-        required: false
-        type: string
-      before_install_upstream_dependencies:
-        description: 'BEFORE_INSTALL_UPSTREAM_DEPENDENCIES variable for industrial_ci'
-        default: ''
-        required: false
-        type: string
-
-      ccache_dir:
-        description: 'Local path to store cache (from "github.workspace"). For standard industrial_ci configuration do not have to be changed'
-        default: '.ccache'
-        required: false
-        type: string
-      basedir:
-        description: 'Local path to workspace base directory to cache (from "github.workspace"). For standard industrial_ci configuration do not have to be changed'
-        default: '.work'
-        required: false
-        type: string
-
-
-jobs:
-  reusable_industrial_ci_with_cache:
-    name: ${{ inputs.ros_distro }} ${{ inputs.ros_repo }} ${{ inputs.os_code_name }}
-    runs-on: ubuntu-latest
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
-      BASEDIR: ${{ github.workspace }}/${{ inputs.basedir }}
-      CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}-${{ github.job }}
-    steps:
-      - name: Checkout ${{ inputs.ref }} when build is not scheduled
-        if: ${{ github.event_name != 'schedule' }}
-        uses: actions/checkout@v4
-      - name: Checkout ${{ inputs.ref }} on scheduled build
-        if: ${{ github.event_name == 'schedule' }}
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref_for_scheduled_build }}
-      - name: cache target_ws
-        if: ${{ ! matrix.env.CCOV }}
-        uses: pat-s/always-upload-cache@v3.0.11
-        with:
-          path: ${{ env.BASEDIR }}/target_ws
-          key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }}
-          restore-keys: |
-            target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
-      - name: cache ccache
-        uses: pat-s/always-upload-cache@v3.0.11
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
-          restore-keys: |
-            ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}
-            ccache-${{ env.CACHE_PREFIX }}
-      - uses: 'ros-industrial/industrial_ci@master'
-        env:
-          UPSTREAM_WORKSPACE: ${{ inputs.upstream_workspace }}
-          ROS_DISTRO: ${{ inputs.ros_distro }}
-          ROS_REPO: ${{ inputs.ros_repo }}
-          OS_CODE_NAME: ${{ inputs.os_code_name }}
-          BEFORE_INSTALL_UPSTREAM_DEPENDENCIES: ${{ inputs.before_install_upstream_dependencies }}
-      - name: prepare target_ws for cache
-        if: ${{ always() && ! matrix.env.CCOV }}
-        run: |
-          du -sh ${{ env.BASEDIR }}/target_ws
-          sudo find ${{ env.BASEDIR }}/target_ws -wholename '*/test_results/*' -delete
-          sudo rm -rf ${{ env.BASEDIR }}/target_ws/src
-          du -sh ${{ env.BASEDIR }}/target_ws
diff --git a/.github/workflows/reusable-ros-tooling-source-build.yml b/.github/workflows/reusable-ros-tooling-source-build.yml
deleted file mode 100644
index 3d5bc1cf35..0000000000
--- a/.github/workflows/reusable-ros-tooling-source-build.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-name: Reusable industrial_ci Workflow with Cache
-# Reusable action to simplify dealing with ROS/ROS2 industrial_ci builds with cache
-# author: Denis Štogl <denis@stoglrobotics.de>
-
-on:
-  workflow_call:
-    inputs:
-      ros_distro:
-        description: 'ROS2 distribution name'
-        required: true
-        type: string
-      ref:
-        description: 'Reference on which the repo should be checkout. Usually is this name of a branch or a tag.'
-        required: true
-        type: string
-      ros2_repo_branch:
-        description: 'Branch in the ros2/ros2 repozitory from which ".repos" should be used. Possible values: master (Rolling), humble.'
-        default: 'master'
-        required: false
-        type: string
-
-jobs:
-  reusable_ros_tooling_source_build:
-    name: ${{ inputs.ros_distro }} ubuntu-22.04
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: ros-tooling/setup-ros@0.7.1
-        with:
-          required-ros-distributions: ${{ inputs.ros_distro }}
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
-      - uses: ros-tooling/action-ros-ci@0.3.6
-        with:
-          target-ros2-distro: ${{ inputs.ros_distro }}
-          ref: ${{ inputs.ref }}
-          # build all packages listed in the meta package
-          package-name:
-            ackermann_steering_controller
-            admittance_controller
-            bicycle_steering_controller
-            diff_drive_controller
-            effort_controllers
-            force_torque_sensor_broadcaster
-            forward_command_controller
-            gripper_controllers
-            imu_sensor_broadcaster
-            joint_state_broadcaster
-            joint_trajectory_controller
-            position_controllers
-            range_sensor_broadcaster
-            ros2_controllers
-            ros2_controllers_test_nodes
-            rqt_joint_trajectory_controller
-            steering_controllers_library
-            tricycle_controller
-            tricycle_steering_controller
-            velocity_controllers
-
-          vcs-repo-file-url: |
-            https://raw.githubusercontent.com/ros2/ros2/${{ inputs.ros2_repo_branch }}/ros2.repos
-            https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_controllers.${{ inputs.ros_distro }}.repos?token=${{ secrets.GITHUB_TOKEN }}
-          colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-      - uses: actions/upload-artifact@v4.3.1
-        with:
-          name: colcon-logs-ubuntu-22.04
-          path: ros_ws/log
diff --git a/.github/workflows/rolling-binary-build-testing.yml b/.github/workflows/rolling-binary-build-testing.yml
deleted file mode 100644
index 9b480d99c3..0000000000
--- a/.github/workflows/rolling-binary-build-testing.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Rolling Binary Build - testing
-# author: Denis Štogl <denis@stoglrobotics.de>
-# description: 'Build & test all dependencies from released (binary) packages.'
-
-on:
-  workflow_dispatch:
-    branches:
-      - master
-      - '*feature*'
-      - '*feature/**'
-  pull_request:
-    branches:
-      - master
-      - '*feature*'
-      - '*feature/**'
-  push:
-    branches:
-      - master
-  schedule:
-    # Run every morning to detect flakiness and broken dependencies
-    - cron: '03 1 * * *'
-
-jobs:
-  binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
-    with:
-      ros_distro: rolling
-      ros_repo: testing
-      upstream_workspace: ros2_controllers-not-released.rolling.repos
-      ref_for_scheduled_build: master
diff --git a/.github/workflows/rolling-binary-build-main.yml b/.github/workflows/rolling-binary-build.yml
similarity index 72%
rename from .github/workflows/rolling-binary-build-main.yml
rename to .github/workflows/rolling-binary-build.yml
index 793db5d7e5..7b5a3bda65 100644
--- a/.github/workflows/rolling-binary-build-main.yml
+++ b/.github/workflows/rolling-binary-build.yml
@@ -1,4 +1,4 @@
-name: Rolling Binary Build - main
+name: Rolling Binary Build
 # author: Denis Štogl <denis@stoglrobotics.de>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
@@ -22,9 +22,12 @@ on:
 
 jobs:
   binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_REPO: [main, testing]
     with:
       ros_distro: rolling
-      ros_repo: main
+      ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.rolling.repos
       ref_for_scheduled_build: master
diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml
index b6d0a4193a..a1aed8b415 100644
--- a/.github/workflows/rolling-debian-build.yml
+++ b/.github/workflows/rolling-debian-build.yml
@@ -12,19 +12,9 @@ on:
 jobs:
   rolling_debian:
     name: Rolling debian build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: rolling
-    container: ghcr.io/ros-controls/ros:rolling-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test-result --verbose
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
+    with:
+      ros_distro: rolling
+      upstream_workspace: ros2_controllers.rolling.repos
+      ref_for_scheduled_build: master
+      skip_packages: rqt_joint_trajectory_controller
diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml
deleted file mode 100644
index dece43b673..0000000000
--- a/.github/workflows/rolling-rhel-binary-build.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: RHEL Rolling Binary Build
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - master
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 1 * * *'
-
-
-jobs:
-  rolling_rhel_binary:
-    name: Rolling RHEL binary build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: rolling
-    container: ghcr.io/ros-controls/ros:rolling-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_controllers || true
-      - name: Build and test
-        # source also underlay workspace with generate_parameter_library on rhel9
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
-          colcon build --packages-skip rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_joint_trajectory_controller
-          colcon test-result --verbose
diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml
new file mode 100644
index 0000000000..a175d951b4
--- /dev/null
+++ b/.github/workflows/rolling-rhel-semi-binary-build.yml
@@ -0,0 +1,19 @@
+name: RHEL Rolling Semi-Binary Build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - master
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '03 1 * * *'
+
+
+jobs:
+  rolling_rhel:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
+    with:
+      ros_distro: rolling
+      upstream_workspace: ros2_controllers.rolling.repos
+      ref_for_scheduled_build: master
+      skip_packages: rqt_joint_trajectory_controller
diff --git a/.github/workflows/rolling-semi-binary-build-testing.yml b/.github/workflows/rolling-semi-binary-build-testing.yml
deleted file mode 100644
index 630881dc0a..0000000000
--- a/.github/workflows/rolling-semi-binary-build-testing.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Rolling Semi-Binary Build - testing
-# description: 'Build & test that compiles the main dependencies from source.'
-
-on:
-  workflow_dispatch:
-    branches:
-      - master
-      - '*feature*'
-      - '*feature/**'
-  pull_request:
-    branches:
-      - master
-      - '*feature*'
-      - '*feature/**'
-  push:
-    branches:
-      - master
-  schedule:
-    # Run every morning to detect flakiness and broken dependencies
-    - cron: '33 1 * * *'
-
-jobs:
-  semi_binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
-    with:
-      ros_distro: rolling
-      ros_repo: testing
-      upstream_workspace: ros2_controllers.rolling.repos
-      ref_for_scheduled_build: master
diff --git a/.github/workflows/rolling-semi-binary-build-main.yml b/.github/workflows/rolling-semi-binary-build.yml
similarity index 70%
rename from .github/workflows/rolling-semi-binary-build-main.yml
rename to .github/workflows/rolling-semi-binary-build.yml
index 8b395e5163..a20c4d4fd3 100644
--- a/.github/workflows/rolling-semi-binary-build-main.yml
+++ b/.github/workflows/rolling-semi-binary-build.yml
@@ -1,4 +1,4 @@
-name: Rolling Semi-Binary Build - main
+name: Rolling Semi-Binary Build
 # description: 'Build & test that compiles the main dependencies from source.'
 
 on:
@@ -21,9 +21,12 @@ on:
 
 jobs:
   semi_binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      matrix:
+        ROS_REPO: [main, testing]
     with:
       ros_distro: rolling
-      ros_repo: main
+      ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
diff --git a/.github/workflows/rolling-source-build.yml b/.github/workflows/rolling-source-build.yml
index 40abcd1b0c..567b2c8ec6 100644
--- a/.github/workflows/rolling-source-build.yml
+++ b/.github/workflows/rolling-source-build.yml
@@ -1,8 +1,6 @@
 name: Rolling Source Build
 on:
   workflow_dispatch:
-    branches:
-      - master
   push:
     branches:
       - master
@@ -12,7 +10,7 @@ on:
 
 jobs:
   source:
-    uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
     with:
       ros_distro: rolling
       ref: master