diff --git a/.github/workflows/docker-multi-arch.yml b/.github/workflows/docker-multi-arch.yml
index 8ab1328..dc844fe 100644
--- a/.github/workflows/docker-multi-arch.yml
+++ b/.github/workflows/docker-multi-arch.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        base: [ "jammy" ]
+        base: [ "noble" ]
         build_mode: ["full", "renderer"]
 
     steps:
@@ -35,6 +35,7 @@ jobs:
           echo "REF: ["$ref"]"
 
           declare -A base_images
+          base_images[noble]=ubuntu:noble
           base_images[mantic]=ubuntu:mantic
           base_images[lunar]=ubuntu:lunar
           base_images[kinetic]=ubuntu:kinetic
@@ -49,8 +50,8 @@ jobs:
           echo "Building build_key: ["$build_key"]";
 
           declare -A special_tags
-          special_tags[jammy-full]="${image_name}:latest,${image_name}:latest-full,${image_name}:stable,${image_name}:ubuntu-lts-full,${image_name}:stable-full"
-          special_tags[jammy-renderer]="${image_name}:renderer,${image_name}:latest-renderer,${image_name}:stable-renderer,${image_name}:ubuntu-lts-renderer"
+          special_tags[noble-full]="${image_name}:latest,${image_name}:latest-full,${image_name}:stable,${image_name}:ubuntu-lts-full,${image_name}:stable-full"
+          special_tags[noble-renderer]="${image_name}:renderer,${image_name}:latest-renderer,${image_name}:stable-renderer,${image_name}:ubuntu-lts-renderer"
           special_tags[mantic-full]="${image_name}:ubuntu-current-full"
           special_tags[mantic-renderer]="${image_name}:ubuntu-current-renderer"
           special_tags[bookworm-full]="${image_name}:debian-stable-full"
diff --git a/Dockerfile b/Dockerfile
index f616265..dc0932f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG BASE_IMAGE="${BASE_IMAGE:-ubuntu:jammy}"
+ARG BASE_IMAGE="${BASE_IMAGE:-ubuntu:noble}"
 FROM ${BASE_IMAGE} AS BASE
-ARG BASE_IMAGE="${BASE_IMAGE:-ubuntu:jammy}"
+ARG BASE_IMAGE="${BASE_IMAGE:-ubuntu:noble}"
 ARG USE_PPA="${USE_PPA:-upnpp1}"
 ARG BUILD_MODE="${BUILD_MODE:-full}"
 ARG USE_APT_PROXY
diff --git a/README.md b/README.md
index 9f6bf28..cba0648 100644
--- a/README.md
+++ b/README.md
@@ -147,10 +147,8 @@ Please find a list of the currently built images in the following table.
 
 Base Image|Build Mode|Tags
 :---|:---:|:---
-ubuntu:jammy|full|`latest` `latest-full` `stable` `stable-full` `ubuntu-lts-full` `jammy-full` `daily-jammy-full`
-ubuntu:jammy|renderer|`renderer` `latest-renderer` `stable-renderer` `ubuntu-lts-renderer` `jammy-renderer` `daily-jammy-renderer`
-ubuntu:mantic|full|`ubuntu-current-full` `mantic-full` `daily-mantic-full`
-ubuntu:mantic|renderer|`ubuntu-current-renderer` `mantic-renderer` `daily-mantic-renderer`
+ubuntu:noble|full|`latest` `latest-full` `stable` `stable-full` `ubuntu-lts-full` `noble-full` `daily-noble-full`
+ubuntu:noble|renderer|`renderer` `latest-renderer` `stable-renderer` `ubuntu-lts-renderer` `noble-renderer` `daily-noble-renderer`
 debian:bookworm-slim|full|`bookworm-full` `daily-bookworm-full`
 debian:bookworm-slim|renderer|`bookworm-renderer` `daily-bookworm-renderer`
 
diff --git a/app/install/setup.sh b/app/install/setup.sh
index fe8febc..bd9038c 100644
--- a/app/install/setup.sh
+++ b/app/install/setup.sh
@@ -14,6 +14,7 @@ if [ "$BUILD_MODE" = "full" ]; then
     declare -A needs_switch
     needs_switch[bookworm-slim]=1
     needs_switch[mantic]=1
+    needs_switch[noble]=1
     add_switch=0
     if [[ -v needs_switch[$IMAGE_VERSION] ]]; then
         add_switch=${needs_switch[$IMAGE_VERSION]}
diff --git a/build.sh b/build.sh
index 7442f11..bf61137 100755
--- a/build.sh
+++ b/build.sh
@@ -4,13 +4,14 @@ declare -A base_images
 
 base_images[bookworm]=debian:bookworm-slim
 base_images[bullseye]=debian:bullseye-slim
+base_images[noble]=ubuntu:noble
 base_images[mantic]=ubuntu:mantic
 base_images[lunar]=ubuntu:lunar
 base_images[kinetic]=ubuntu:kinetic
 base_images[jammy]=ubuntu:jammy
 base_images[focal]=ubuntu:focal
 
-DEFAULT_BASE_IMAGE=jammy
+DEFAULT_BASE_IMAGE=noble
 DEFAULT_TAG=local
 DEFAULT_USE_PROXY=N
 DEFAULT_PPA=upnpp1
diff --git a/doc/change-history.md b/doc/change-history.md
index d3ea1c5..8d349ad 100644
--- a/doc/change-history.md
+++ b/doc/change-history.md
@@ -2,6 +2,7 @@
 
 Change Date|Major Changes
 ---|---
+2024-05-14|Switch to ubuntu noble (see issue [#409](https://github.com/GioF71/upmpdcli-docker/issues/409))
 2024-05-13|Set title for Mother Earth Radio (see issue [#407](https://github.com/GioF71/upmpdcli-docker/issues/407))
 2024-05-10|Support for config file snippet (see issue [#401](https://github.com/GioF71/upmpdcli-docker/issues/401))
 2024-05-01|Support for `subsonictitle` (see issue [#398](https://github.com/GioF71/upmpdcli-docker/issues/398))