diff --git a/.github/workflows/docker-ros2.yml b/.github/workflows/docker-ros2.yml
index 60e114c3..f7069e80 100644
--- a/.github/workflows/docker-ros2.yml
+++ b/.github/workflows/docker-ros2.yml
@@ -11,7 +11,7 @@ jobs:
     
     strategy:
       matrix:
-        docker_tag: [humble, humble-latest, iron, iron-latest, jazzy-latest]
+        docker_tag: [humble, humble-latest, jazzy, jazzy-latest]
         include:
         - docker_tag: humble
           docker_path: 'humble'
@@ -22,19 +22,11 @@ jobs:
           docker_platforms: |
             linux/amd64
             linux/arm64
-        - docker_tag: iron
-          docker_path: 'iron'
+        - docker_tag: jazzy
+          docker_path: 'jazzy'
           docker_platforms: |
             linux/amd64
-        - docker_tag: iron-latest
-          docker_path: 'iron/latest'
-          docker_platforms: |
-            linux/amd64
-# Re-add "jazzy" after binaries are released
-#        - docker_tag: jazzy
-#          docker_path: 'jazzy'
-#          docker_platforms: |
-#            linux/amd64
+            linux/arm64
         - docker_tag: jazzy-latest
           docker_path: 'jazzy/latest'
           docker_platforms: |
diff --git a/.github/workflows/ros2.yml b/.github/workflows/ros2.yml
index 3bac8867..ad83b0a8 100644
--- a/.github/workflows/ros2.yml
+++ b/.github/workflows/ros2.yml
@@ -3,7 +3,7 @@ name: ros2
 
 on:
   push:
-    branches: [ ros2 ]
+    branches: [ ros2, humble-devel, jazzy-devel]
   pull_request:
     branches: [ ros2 ]
 
@@ -21,15 +21,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ros_distro: [humble, iron]
+        ros_distro: [humble, jazzy]
         include:
         - ros_distro: 'humble'
           ubuntu_distro: 'jammy'
-        - ros_distro: 'iron'
-          ubuntu_distro: 'jammy'
-# Disabled as there still missing dependencies on jazzy:
-#        - ros_distro: 'jazzy'
-#          ubuntu_distro: 'noble'
+        - ros_distro: 'jazzy'
+          ubuntu_distro: 'noble'
       fail-fast: false
     container:
       image: rostooling/setup-ros-docker:ubuntu-${{ matrix.ubuntu_distro }}-ros-${{ matrix.ros_distro }}-desktop-latest