diff --git a/docker/cross-compilation/aarch64-unknown-linux-gnu/Dockerfile b/docker/cross-compilation/aarch64-unknown-linux-gnu/Dockerfile
index 4b262f7a1a..7a8e311de4 100644
--- a/docker/cross-compilation/aarch64-unknown-linux-gnu/Dockerfile
+++ b/docker/cross-compilation/aarch64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/docker/cross-compilation/arm-unknown-linux-gnueabihf/Dockerfile b/docker/cross-compilation/arm-unknown-linux-gnueabihf/Dockerfile
index f513de2aa1..81d586c0fb 100644
--- a/docker/cross-compilation/arm-unknown-linux-gnueabihf/Dockerfile
+++ b/docker/cross-compilation/arm-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/docker/cross-compilation/armv7-unknown-linux-gnueabihf/Dockerfile b/docker/cross-compilation/armv7-unknown-linux-gnueabihf/Dockerfile
index 4f344bfecb..ee3bfbf74a 100644
--- a/docker/cross-compilation/armv7-unknown-linux-gnueabihf/Dockerfile
+++ b/docker/cross-compilation/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/docker/cross-compilation/x86_64-unknown-linux-gnu/Dockerfile b/docker/cross-compilation/x86_64-unknown-linux-gnu/Dockerfile
index fc83400fc5..394f270196 100644
--- a/docker/cross-compilation/x86_64-unknown-linux-gnu/Dockerfile
+++ b/docker/cross-compilation/x86_64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/docker/debug-run/Dockerfile b/docker/debug-run/Dockerfile
index f3c9d2ff4d..ef873e42bf 100644
--- a/docker/debug-run/Dockerfile
+++ b/docker/debug-run/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \