diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml
index 61fddc1..83f5ce7 100644
--- a/.github/workflows/build_docker_images.yml
+++ b/.github/workflows/build_docker_images.yml
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
 
 env:
-  DEFAULT_UBUNTU_DIST: jammy  # for the default dist, no suffix to tag
+  DEFAULT_UBUNTU_DIST: noble  # for the default dist, no suffix to tag
   DOCKER_CLI_EXPERIMENTAL: enabled
 
 jobs:
diff --git a/desktop/Dockerfile b/desktop/Dockerfile
index c5ea18b..154ef69 100644
--- a/desktop/Dockerfile
+++ b/desktop/Dockerfile
@@ -1,5 +1,5 @@
 
-ARG ubuntu_dist=jammy
+ARG ubuntu_dist=noble
 
 FROM ubuntu:${ubuntu_dist}
 LABEL maintainer="OPENGIS.ch <info@opengis.ch>"
diff --git a/server/Dockerfile b/server/Dockerfile
index 447236d..e0a2d20 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ARG ubuntu_dist=jammy
+ARG ubuntu_dist=noble
 
 FROM ubuntu:${ubuntu_dist}
 LABEL maintainer="OPENGIS.ch <info@opengis.ch>"
diff --git a/server/README.md b/server/README.md
index ecef8a9..f275f0a 100644
--- a/server/README.md
+++ b/server/README.md
@@ -7,7 +7,7 @@ They are considered as NOT production ready.
 
 ## General information
 
-The Docker image is built using *Ubuntu 20.04 (focal) and 22.04 (jammy)* and official QGIS DEBs from <https://qgis.org/>.
+The Docker image is built using *Ubuntu 20.04 (focal), 22.04 (jammy) and 24.04 (noble)* and official QGIS DEBs from <https://qgis.org/>.
 It includes *Nginx* and *Xvfb* and can be used as a standalone service (via HTTP TCP port 80) or as *FCGI* backend (via TCP port 9993).
 
 ## Requisites