diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba7cdde6..02ad88ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
   micro_ros_build:
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:jammy
+      image: ubuntu:24.04
     strategy:
       fail-fast: false
     steps:
@@ -22,7 +22,7 @@ jobs:
         with:
           path: src/micro_ros_setup
 
-      - uses: ros-tooling/setup-ros@0.7.0
+      - uses: ros-tooling/setup-ros@0.7.1
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -62,7 +62,7 @@ jobs:
         with:
           path: src/micro_ros_setup
 
-      - uses: ros-tooling/setup-ros@0.7.0
+      - uses: ros-tooling/setup-ros@0.7.1
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -209,7 +209,7 @@ jobs:
         with:
           path: src/micro_ros_setup
 
-      - uses: ros-tooling/setup-ros@0.7.0
+      - uses: ros-tooling/setup-ros@0.7.1
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 077f1bde..14ac7eb7 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -18,7 +18,7 @@ jobs:
         include:
           - distro: rolling
             branch: rolling
-            image: ubuntu:jammy
+            image: ubuntu:24.04
           - distro: iron
             branch: iron
             image: ubuntu:jammy
@@ -34,7 +34,7 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ matrix.branch }}
 
-      - uses: ros-tooling/setup-ros@0.7.0
+      - uses: ros-tooling/setup-ros@0.7.1
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.distro }}
@@ -527,7 +527,7 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ matrix.branch }}
 
-      - uses: ros-tooling/setup-ros@0.7.0
+      - uses: ros-tooling/setup-ros@0.7.1
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.distro }}
@@ -588,7 +588,7 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ matrix.branch }}
 
-      - uses: ros-tooling/setup-ros@0.7.0
+      - uses: ros-tooling/setup-ros@0.7.1
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.distro }}