diff --git a/.github/workflows/humble-source-build.yml b/.github/workflows/humble-source-build.yml
index 8ff2c7254c..0f4b0a5f2d 100644
--- a/.github/workflows/humble-source-build.yml
+++ b/.github/workflows/humble-source-build.yml
@@ -15,3 +15,4 @@ jobs:
       ros_distro: humble
       ref: humble
       ros2_repo_branch: humble
+      os_name: ubuntu-22.04
diff --git a/.github/workflows/iron-source-build.yml b/.github/workflows/iron-source-build.yml
index 3609dcfc41..2d12734df0 100644
--- a/.github/workflows/iron-source-build.yml
+++ b/.github/workflows/iron-source-build.yml
@@ -15,3 +15,4 @@ jobs:
       ros_distro: iron
       ref: iron
       ros2_repo_branch: iron
+      os_name: ubuntu-22.04
diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml
index 4d4750c54c..8374afe8dc 100644
--- a/.github/workflows/rolling-coverage-build.yml
+++ b/.github/workflows/rolling-coverage-build.yml
@@ -14,4 +14,4 @@ jobs:
     secrets: inherit
     with:
       ros_distro: rolling
-      os_name: ubuntu-22.04
+      container: ubuntu:24.04
diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml
index 9c87311bd7..4d91d19100 100644
--- a/.github/workflows/rolling-pre-commit.yml
+++ b/.github/workflows/rolling-pre-commit.yml
@@ -11,4 +11,4 @@ jobs:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
     with:
       ros_distro: rolling
-      os_name: ubuntu-22.04
+      container: ubuntu:24.04
diff --git a/.github/workflows/rolling-source-build.yml b/.github/workflows/rolling-source-build.yml
index 567b2c8ec6..ae38197455 100644
--- a/.github/workflows/rolling-source-build.yml
+++ b/.github/workflows/rolling-source-build.yml
@@ -15,3 +15,4 @@ jobs:
       ros_distro: rolling
       ref: master
       ros2_repo_branch: rolling
+      container: ubuntu:24.04