diff --git a/.github/workflows/build-ubuntu-24.04-fri-1.11.yml b/.github/workflows/build-ubuntu-26.04-fri-1.11.yml
similarity index 65%
rename from .github/workflows/build-ubuntu-24.04-fri-1.11.yml
rename to .github/workflows/build-ubuntu-26.04-fri-1.11.yml
index 24c84032..5068cbdb 100644
--- a/.github/workflows/build-ubuntu-24.04-fri-1.11.yml
+++ b/.github/workflows/build-ubuntu-26.04-fri-1.11.yml
@@ -1,4 +1,4 @@
-name: ubuntu-24.04-fri-1.11
+name: ubuntu-26.04-fri-1.11
 on:
   pull_request:
     branches:
@@ -9,6 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build-ubuntu-24.04.yml
+    uses: ./.github/workflows/build-ubuntu-26.04.yml
     with:
       fri_version: 1.11
diff --git a/.github/workflows/build-ubuntu-24.04-fri-1.14.yml b/.github/workflows/build-ubuntu-26.04-fri-1.14.yml
similarity index 65%
rename from .github/workflows/build-ubuntu-24.04-fri-1.14.yml
rename to .github/workflows/build-ubuntu-26.04-fri-1.14.yml
index 67c938e5..054b45ee 100644
--- a/.github/workflows/build-ubuntu-24.04-fri-1.14.yml
+++ b/.github/workflows/build-ubuntu-26.04-fri-1.14.yml
@@ -1,4 +1,4 @@
-name: ubuntu-24.04-fri-1.14
+name: ubuntu-26.04-fri-1.14
 on:
   pull_request:
     branches:
@@ -9,6 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build-ubuntu-24.04.yml
+    uses: ./.github/workflows/build-ubuntu-26.04.yml
     with:
       fri_version: 1.14
diff --git a/.github/workflows/build-ubuntu-24.04-fri-1.15.yml b/.github/workflows/build-ubuntu-26.04-fri-1.15.yml
similarity index 65%
rename from .github/workflows/build-ubuntu-24.04-fri-1.15.yml
rename to .github/workflows/build-ubuntu-26.04-fri-1.15.yml
index 8f2f403b..14a7dec3 100644
--- a/.github/workflows/build-ubuntu-24.04-fri-1.15.yml
+++ b/.github/workflows/build-ubuntu-26.04-fri-1.15.yml
@@ -1,4 +1,4 @@
-name: ubuntu-24.04-fri-1.15
+name: ubuntu-26.04-fri-1.15
 on:
   pull_request:
     branches:
@@ -9,6 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build-ubuntu-24.04.yml
+    uses: ./.github/workflows/build-ubuntu-26.04.yml
     with:
       fri_version: 1.15
diff --git a/.github/workflows/build-ubuntu-24.04-fri-1.16.yml b/.github/workflows/build-ubuntu-26.04-fri-1.16.yml
similarity index 65%
rename from .github/workflows/build-ubuntu-24.04-fri-1.16.yml
rename to .github/workflows/build-ubuntu-26.04-fri-1.16.yml
index 42b62a74..08d279f1 100644
--- a/.github/workflows/build-ubuntu-24.04-fri-1.16.yml
+++ b/.github/workflows/build-ubuntu-26.04-fri-1.16.yml
@@ -1,4 +1,4 @@
-name: ubuntu-24.04-fri-1.16
+name: ubuntu-26.04-fri-1.16
 on:
   pull_request:
     branches:
@@ -9,6 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build-ubuntu-24.04.yml
+    uses: ./.github/workflows/build-ubuntu-26.04.yml
     with:
       fri_version: 1.16
diff --git a/.github/workflows/build-ubuntu-24.04-fri-2.5.yml b/.github/workflows/build-ubuntu-26.04-fri-2.5.yml
similarity index 66%
rename from .github/workflows/build-ubuntu-24.04-fri-2.5.yml
rename to .github/workflows/build-ubuntu-26.04-fri-2.5.yml
index 4a4dc25f..00798351 100644
--- a/.github/workflows/build-ubuntu-24.04-fri-2.5.yml
+++ b/.github/workflows/build-ubuntu-26.04-fri-2.5.yml
@@ -1,4 +1,4 @@
-name: ubuntu-24.04-fri-2.5
+name: ubuntu-26.04-fri-2.5
 on:
   pull_request:
     branches:
@@ -9,6 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build-ubuntu-24.04.yml
+    uses: ./.github/workflows/build-ubuntu-26.04.yml
     with:
       fri_version: 2.5
diff --git a/.github/workflows/build-ubuntu-24.04-fri-2.7.yml b/.github/workflows/build-ubuntu-26.04-fri-2.7.yml
similarity index 66%
rename from .github/workflows/build-ubuntu-24.04-fri-2.7.yml
rename to .github/workflows/build-ubuntu-26.04-fri-2.7.yml
index 182033a0..f805841a 100644
--- a/.github/workflows/build-ubuntu-24.04-fri-2.7.yml
+++ b/.github/workflows/build-ubuntu-26.04-fri-2.7.yml
@@ -1,4 +1,4 @@
-name: ubuntu-24.04-fri-2.7
+name: ubuntu-26.04-fri-2.7
 on:
   pull_request:
     branches:
@@ -9,6 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build-ubuntu-24.04.yml
+    uses: ./.github/workflows/build-ubuntu-26.04.yml
     with:
       fri_version: 2.7
diff --git a/.github/workflows/build-ubuntu-24.04.yml b/.github/workflows/build-ubuntu-26.04.yml
similarity index 85%
rename from .github/workflows/build-ubuntu-24.04.yml
rename to .github/workflows/build-ubuntu-26.04.yml
index f5e18de9..990c397e 100644
--- a/.github/workflows/build-ubuntu-24.04.yml
+++ b/.github/workflows/build-ubuntu-26.04.yml
@@ -11,9 +11,9 @@ on:
 # doc: https://ubuntu.com/blog/ros-2-ci-with-github-actions
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     container:
-      image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-desktop-latest
+      image: rostooling/setup-ros-docker:ubuntu-resolute-ros-rolling-desktop-latest
     steps:
       - uses: ros-tooling/action-ros-ci@v0.4
         with:
diff --git a/README.md b/README.md
index df73145e..5a9d5f25 100644
--- a/README.md
+++ b/README.md
@@ -34,13 +34,13 @@ ROS 2 packages for the KUKA LBR, including communication to the real robot via t
 ## Status
 | OS             | ROS Distribution | FRI Version |  Build Status |
 | :------------- | :--------------- | :---------- |  :----------- |
-| `Ubuntu-24.04` | `rolling`         | `1.11`      |  [![ubuntu-24.04-fri-1.11](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.11.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.11.yml) |
-| `Ubuntu-24.04` | `rolling`         | `1.14`      |  [![ubuntu-24.04-fri-1.14](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.14.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.14.yml) |
-| `Ubuntu-24.04` | `rolling`         | `1.15`      |  [![ubuntu-24.04-fri-1.15](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.15.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.15.yml) |
-| `Ubuntu-24.04` | `rolling`         | `1.16`      |  [![ubuntu-24.04-fri-1.16](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.16.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-1.16.yml) |
-| `Ubuntu-24.04` | `rolling`         | `2.5`      |  [![ubuntu-24.04-fri-2.5](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-2.5.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-2.5.yml) |
-| `Ubuntu-24.04` | `rolling`         | `2.6`      |  [![ubuntu-24.04-fri-2.6](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-2.5.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-2.5.yml) |
-| `Ubuntu-24.04` | `rolling`         | `2.7`      |  [![ubuntu-24.04-fri-2.7](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-2.7.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-24.04-fri-2.7.yml) |
+| `Ubuntu-26.04` | `rolling`         | `1.11`      |  [![ubuntu-26.04-fri-1.11](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.11.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.11.yml) |
+| `Ubuntu-26.04` | `rolling`         | `1.14`      |  [![ubuntu-26.04-fri-1.14](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.14.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.14.yml) |
+| `Ubuntu-26.04` | `rolling`         | `1.15`      |  [![ubuntu-26.04-fri-1.15](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.15.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.15.yml) |
+| `Ubuntu-26.04` | `rolling`         | `1.16`      |  [![ubuntu-26.04-fri-1.16](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.16.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-1.16.yml) |
+| `Ubuntu-26.04` | `rolling`         | `2.5`      |  [![ubuntu-26.04-fri-2.5](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-2.5.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-2.5.yml) |
+| `Ubuntu-26.04` | `rolling`         | `2.6`      |  [![ubuntu-26.04-fri-2.6](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-2.5.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-2.5.yml) |
+| `Ubuntu-26.04` | `rolling`         | `2.7`      |  [![ubuntu-26.04-fri-2.7](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-2.7.yml/badge.svg)](https://github.com/lbr-stack/lbr_fri_ros2_stack/actions/workflows/build-ubuntu-26.04-fri-2.7.yml) |
 
 ## Documentation
 Full documentation available on [Read the Docs](https://lbr-stack.readthedocs.io/en/latest).