diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 389e957..ce56041 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,17 +18,22 @@ jobs:
         include:
           - docker_image: ubuntu:24.04
             ros_distribution: kilted
+
     container:
       image: ${{ matrix.docker_image }}
+
     steps:
-    - uses: actions/checkout@v3
-    - uses: ros-tooling/setup-ros@0.7.13
+    - uses: actions/checkout@v7
+
+    - uses: ros-tooling/setup-ros@0.7.19
       with:
         required-ros-distributions: ${{ matrix.ros_distribution }}
-    - uses : ros-tooling/action-ros-ci@0.4.3
+
+    - uses : ros-tooling/action-ros-ci@0.4.8
       with:
         package-name: "micro_ros_utilities"
         target-ros2-distro: ${{ matrix.ros_distribution }}
+        coverage-result: false
         colcon-defaults: |
           {
             "build": {
@@ -36,6 +41,19 @@ jobs:
             }
           }
         colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-    - uses: codecov/codecov-action@v1
+
+    - name: Coverage results
+      working-directory: ros_ws
+      run: |
+        . /opt/ros/${{ matrix.ros_distribution }}/setup.sh
+        colcon lcov-result --initial --lcov-args="--ignore-errors=mismatch"
+        colcon lcov-result --packages-select micro_ros_utilities --verbose --lcov-args="--ignore-errors=mismatch"
+
+    - run: apt-get update && apt-get install -y gnupg # Needed for codecov action
+
+    - uses: codecov/codecov-action@v5
       with:
-        file: ros_ws/lcov/total_coverage.info
+        files: ros_ws/lcov/total_coverage.info
+        disable_search: true
+        token: ${{ secrets.CODECOV_TOKEN }}
+        fail_ci_if_error: false
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c8a08a4..b87f180 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -24,17 +24,22 @@ jobs:
             ros_distribution: jazzy
           - docker_image: ubuntu:jammy
             ros_distribution: humble
+
     container:
       image: ${{ matrix.docker_image }}
+
     steps:
-    - uses: actions/checkout@v3
-    - uses: ros-tooling/setup-ros@0.7.13
+    - uses: actions/checkout@v7
+
+    - uses: ros-tooling/setup-ros@0.7.19
       with:
         required-ros-distributions: ${{ matrix.ros_distribution }}
-    - uses : ros-tooling/action-ros-ci@0.4.3
+
+    - uses : ros-tooling/action-ros-ci@0.4.8
       with:
         package-name: "micro_ros_utilities"
         target-ros2-distro: ${{ matrix.ros_distribution }}
+        coverage-result: false
         colcon-defaults: |
           {
             "build": {
@@ -42,6 +47,19 @@ jobs:
             }
           }
         colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-    - uses: codecov/codecov-action@v1
+
+    - name: Coverage results
+      working-directory: ros_ws
+      run: |
+        . /opt/ros/${{ matrix.ros_distribution }}/setup.sh
+        colcon lcov-result --initial --lcov-args="--ignore-errors=mismatch"
+        colcon lcov-result --packages-select micro_ros_utilities --verbose --lcov-args="--ignore-errors=mismatch"
+
+    - run: apt-get update && apt-get install -y gnupg # Needed for codecov action
+
+    - uses: codecov/codecov-action@v5
       with:
-        file: ros_ws/lcov/total_coverage.info
+        files: ros_ws/lcov/total_coverage.info
+        disable_search: true
+        token: ${{ secrets.CODECOV_TOKEN }}
+        fail_ci_if_error: false