diff --git a/.github/workflows/docker-multi-arch.yml b/.github/workflows/docker-multi-arch.yml
index 1720e26..9d2fb94 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", "lunar", "bookworm"]
+        base: [ "jammy", "mantic", "bookworm"]
         build_mode: ["full", "renderer"]
 
     steps:
@@ -35,13 +35,9 @@ jobs:
           echo "REF: ["$ref"]"
 
           declare -A base_images
-          base_images[lunar]=ubuntu:lunar
-          base_images[kinetic]=ubuntu:kinetic
+          base_images[mantic]=ubuntu:mantic
           base_images[jammy]=ubuntu:jammy
-          base_images[focal]=ubuntu:focal
           base_images[bookworm]=debian:bookworm-slim
-          base_images[bullseye]=debian:bullseye-slim
-          base_images[buster]=debian:buster-slim
 
           image_name="${{secrets.DOCKER_USERNAME}}/upmpdcli"
 
@@ -53,8 +49,8 @@ jobs:
           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[lunar-full]="${image_name}:ubuntu-current-full"
-          special_tags[lunar-renderer]="${image_name}:ubuntu-current-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"
           special_tags[bookworm-renderer]="${image_name}:debian-stable-renderer"
           special_tags[bullseye-full]="${image_name}:debian-oldstable-full"
diff --git a/README.md b/README.md
index fb5aa0b..22434ba 100644
--- a/README.md
+++ b/README.md
@@ -128,8 +128,8 @@ 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:lunar|full|`ubuntu-current-full` `lunar-full` `daily-lunar-full`
-ubuntu:lunar|renderer|`ubuntu-current-renderer` `lunar-renderer` `daily-lunar-renderer`
+ubuntu:mantic|full|`ubuntu-current-full` `mantic-full` `daily-mantic-full`
+ubuntu:mantic|renderer|`ubuntu-current-renderer` `mantic-renderer` `daily-mantic-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 b8f98b6..f31e312 100644
--- a/app/install/setup.sh
+++ b/app/install/setup.sh
@@ -11,6 +11,7 @@ if [ "$BUILD_MODE" = "full" ]; then
     declare -A needs_switch
     needs_switch[bookworm-slim]=1
     needs_switch[lunar]=1
+    needs_switch[mantic]=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 1bc65c7..7442f11 100755
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,7 @@ declare -A base_images
 
 base_images[bookworm]=debian:bookworm-slim
 base_images[bullseye]=debian:bullseye-slim
+base_images[mantic]=ubuntu:mantic
 base_images[lunar]=ubuntu:lunar
 base_images[kinetic]=ubuntu:kinetic
 base_images[jammy]=ubuntu:jammy
diff --git a/doc/change-history.md b/doc/change-history.md
index 60864c2..b5efb14 100644
--- a/doc/change-history.md
+++ b/doc/change-history.md
@@ -2,6 +2,7 @@
 
 Change Date|Major Changes
 ---|---
+2023-11-14|Switch from lunar to mantic (see issue [#316](https://github.com/GioF71/upmpdcli-docker/issues/316))
 2023-11-13|Add tidal package to installation list (see issue [#313](https://github.com/GioF71/upmpdcli-docker/issues/313))
 2023-11-04|Add installation of new packages (see issue [#309](https://github.com/GioF71/upmpdcli-docker/issues/309)) 
 2023-11-04|Update to Upmpdcli version 1.8.4, first version with new radio plugins (see issue [#305](https://github.com/GioF71/upmpdcli-docker/issues/305))