diff --git a/.github/workflows/binary-build.yml b/.github/workflows/build-binary.yml
similarity index 100%
rename from .github/workflows/binary-build.yml
rename to .github/workflows/build-binary.yml
diff --git a/.github/workflows/build-source_humble.yml b/.github/workflows/build-source.yml
similarity index 58%
rename from .github/workflows/build-source_humble.yml
rename to .github/workflows/build-source.yml
index 4cf8d966..3a31aa8c 100644
--- a/.github/workflows/build-source_humble.yml
+++ b/.github/workflows/build-source.yml
@@ -1,4 +1,4 @@
-name: Source Build - Humble
+name: Source Build
 on:
   workflow_dispatch:
   push:
@@ -9,9 +9,12 @@ on:
     - cron: '03 3 * * *'
 
 jobs:
-  source:
+  source_build:
     uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling, iron, humble]
     with:
-      ros_distro: humble
+      ros_distro: ${{ matrix.ROS_DISTRO }}
       ref: ros2-master
-      ros2_repo_branch: humble
+      ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
diff --git a/.github/workflows/build-source_iron.yml b/.github/workflows/build-source_iron.yml
deleted file mode 100644
index 3ec6feb6..00000000
--- a/.github/workflows/build-source_iron.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Source Build - Iron
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - ros2-master
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 3 * * *'
-
-jobs:
-  source:
-    uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
-    with:
-      ros_distro: iron
-      ref: ros2-master
-      ros2_repo_branch: iron
diff --git a/.github/workflows/build-source_rollling.yml b/.github/workflows/build-source_rollling.yml
deleted file mode 100644
index 14dacac0..00000000
--- a/.github/workflows/build-source_rollling.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Source Build - Rolling
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - ros2-master
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 3 * * *'
-
-jobs:
-  source:
-    uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
-    with:
-      ros_distro: rolling
-      ref: ros2-master
-      ros2_repo_branch: rolling
diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/debian-build.yml
similarity index 55%
rename from .github/workflows/rolling-debian-build.yml
rename to .github/workflows/debian-build.yml
index 02364133..bd54edfd 100644
--- a/.github/workflows/rolling-debian-build.yml
+++ b/.github/workflows/debian-build.yml
@@ -1,4 +1,4 @@
-name: Debian Rolling Source Build
+name: Debian Source Build
 on:
   workflow_dispatch:
   pull_request:
@@ -10,10 +10,12 @@ on:
 
 
 jobs:
-  rolling_debian:
-    name: Rolling debian build
+  debian_source_build:
     uses: ./.github/workflows/reusable-debian-build.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling, iron, humble]
     with:
-      ros_distro: rolling
-      upstream_workspace: control_toolbox.rolling.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: ros2-master
diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml
deleted file mode 100644
index 3eda1ff0..00000000
--- a/.github/workflows/humble-debian-build.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Debian Humble Source Build
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - ros2-master
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 5 * * *'
-
-
-jobs:
-  humble_debian:
-    name: Humble debian build
-    uses: ./.github/workflows/reusable-debian-build.yml
-    with:
-      ros_distro: humble
-      upstream_workspace: control_toolbox.humble.repos
-      ref_for_scheduled_build: ros2-master
diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml
deleted file mode 100644
index 40041016..00000000
--- a/.github/workflows/humble-rhel-binary-build.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: RHEL Humble Semi-Binary Build
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - ros2-master
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 3 * * *'
-
-jobs:
-  humble_rhel:
-    name: Humble RHEL semi-binary build
-    uses: ./.github/workflows/reusable-rhel-binary-build.yml
-    with:
-      ros_distro: humble
-      upstream_workspace: control_toolbox.humble.repos
-      ref_for_scheduled_build: ros2-master
diff --git a/.github/workflows/iron-debian-build.yml b/.github/workflows/iron-debian-build.yml
deleted file mode 100644
index 630e6456..00000000
--- a/.github/workflows/iron-debian-build.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Debian Iron Source Build
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - ros2-master
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 5 * * *'
-
-
-jobs:
-  iron_debian:
-    name: Iron debian build
-    uses: ./.github/workflows/reusable-debian-build.yml
-    with:
-      ros_distro: iron
-      upstream_workspace: control_toolbox.iron.repos
-      ref_for_scheduled_build: ros2-master
diff --git a/.github/workflows/iron-rhel-binary-build.yml b/.github/workflows/iron-rhel-binary-build.yml
deleted file mode 100644
index ddeca446..00000000
--- a/.github/workflows/iron-rhel-binary-build.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: RHEL Iron Semi-Binary Build
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - ros2-master
-  schedule:
-    # Run every day to detect flakiness and broken dependencies
-    - cron: '03 3 * * *'
-
-
-jobs:
-  iron_rhel:
-    name: Iron RHEL semi-binary build
-    uses: ./.github/workflows/reusable-rhel-binary-build.yml
-    with:
-      ros_distro: iron
-      upstream_workspace: control_toolbox.iron.repos
-      ref_for_scheduled_build: ros2-master
diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rhel-semi-binary-build.yml
similarity index 55%
rename from .github/workflows/rolling-rhel-binary-build.yml
rename to .github/workflows/rhel-semi-binary-build.yml
index 9a02341f..b80f2f6b 100644
--- a/.github/workflows/rolling-rhel-binary-build.yml
+++ b/.github/workflows/rhel-semi-binary-build.yml
@@ -1,4 +1,4 @@
-name: RHEL Rolling Semi-Binary Build
+name: RHEL Semi-Binary Build
 on:
   workflow_dispatch:
   pull_request:
@@ -10,10 +10,12 @@ on:
 
 
 jobs:
-  rolling_rhel:
-    name: Rolling RHEL semi-binary build
+  rhel_semi_binary_build:
     uses: ./.github/workflows/reusable-rhel-binary-build.yml
+    strategy:
+      matrix:
+        ROS_DISTRO: [rolling, iron, humble]
     with:
-      ros_distro: rolling
-      upstream_workspace: control_toolbox.rolling.repos
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      upstream_workspace: control_toolbox.${{ matrix.ROS_DISTRO }}.repos
       ref_for_scheduled_build: ros2-master