diff --git a/.github/workflows/ros-humble-ign-test.yaml b/.github/workflows/ros-humble-ign-test.yaml
new file mode 100644
index 0000000..5c81963
--- /dev/null
+++ b/.github/workflows/ros-humble-ign-test.yaml
@@ -0,0 +1,23 @@
+# Humble Hawksbill (May 2022 - May 2027)
+name: ros-humble-ign
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - ros2-ign
+  push:
+    branches:
+      - ros2-ign
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: ros-tooling/setup-ros@v0.7
+        with:
+          required-ros-distributions: humble
+      - uses: ros-tooling/action-ros-ci@v0.3
+        with:
+          package-name: virtual_maize_field
+          target-ros2-distro: humble
\ No newline at end of file
diff --git a/.github/workflows/ros-humble-test.yaml b/.github/workflows/ros-humble-test.yaml
index 7aff833..401e1cb 100644
--- a/.github/workflows/ros-humble-test.yaml
+++ b/.github/workflows/ros-humble-test.yaml
@@ -3,8 +3,6 @@ name: ros-humble
 
 on:
   workflow_dispatch:
-    branches:
-      - ros2
   pull_request:
     branches:
       - ros2
@@ -16,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: ros-tooling/setup-ros@v0.6
+      - uses: ros-tooling/setup-ros@v0.7
         with:
           required-ros-distributions: humble
       - uses: ros-tooling/action-ros-ci@v0.3
diff --git a/.github/workflows/ros-iron-test.yaml b/.github/workflows/ros-iron-test.yaml
index f4e457d..e7b7c22 100644
--- a/.github/workflows/ros-iron-test.yaml
+++ b/.github/workflows/ros-iron-test.yaml
@@ -3,8 +3,6 @@ name: ros-iron
 
 on:
   workflow_dispatch:
-    branches:
-      - ros2
   pull_request:
     branches:
       - ros2
@@ -16,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: ros-tooling/setup-ros@v0.6
+      - uses: ros-tooling/setup-ros@v0.7
         with:
           required-ros-distributions: iron
       - uses: ros-tooling/action-ros-ci@v0.3
diff --git a/.github/workflows/ros-rolling-test.yaml b/.github/workflows/ros-rolling-test.yaml
index b6de0cc..5eb4ecc 100644
--- a/.github/workflows/ros-rolling-test.yaml
+++ b/.github/workflows/ros-rolling-test.yaml
@@ -3,8 +3,6 @@ name: ros-rolling
 
 on:
   workflow_dispatch:
-    branches:
-      - ros2
   pull_request:
     branches:
       - ros2
@@ -14,9 +12,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu:24.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:noble
     steps:
-      - uses: ros-tooling/setup-ros@v0.6
+      - uses: ros-tooling/setup-ros@master
         with:
           required-ros-distributions: rolling
       - uses: ros-tooling/action-ros-ci@v0.3