diff --git a/tools/docker/README.md b/tools/docker/README.md
index 5fb66c55e1..2c1f648117 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -4,8 +4,7 @@
 - Ubuntu
   - focal   (Ubuntu 20.04)
   - jammy   (Ubuntu 22.04)
-  - kinetic (Ubuntu 22.10)
-  - lunar   (Ubuntu 23.04)
+  - noble   (Ubuntu 24.04)
 - Debian
   - buster  (Debian 10.0)
   - sid     (Debian unstable)
diff --git a/tools/docker/kinetic/Dockerfile b/tools/docker/kinetic/Dockerfile
deleted file mode 100644
index 0628842df8..0000000000
--- a/tools/docker/kinetic/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM ubuntu:kinetic
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get dist-upgrade -y \
- && apt-get install -y locales sudo \
- && rm -rf /var/lib/apt/lists/*
-
-RUN locale-gen en_US.UTF-8 \
- && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
-
-RUN adduser --disabled-password --gecos '' docker \
- && adduser docker sudo \
- && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-RUN apt-get update && apt-get install -y \
-    wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
-      unzip diffutils lzop make file g++ xfonts-utils xsltproc default-jre-headless python3 \
-      libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
-      golang-go git openssh-client \
-    --no-install-recommends \
- && rm -rf /var/lib/apt/lists/*
-
-USER docker
diff --git a/tools/docker/lunar/Dockerfile b/tools/docker/lunar/Dockerfile
deleted file mode 100644
index 42aa59bb2b..0000000000
--- a/tools/docker/lunar/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM ubuntu:lunar
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get dist-upgrade -y \
- && apt-get install -y adduser locales sudo \
- && rm -rf /var/lib/apt/lists/*
-
-RUN locale-gen en_US.UTF-8 \
- && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
-ENV LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
-
-RUN adduser --disabled-password --gecos '' docker \
- && adduser docker sudo \
- && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-RUN apt-get update && apt-get install -y \
-    wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
-      unzip diffutils lzop make file g++ xfonts-utils xsltproc default-jre-headless python3 \
-      libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
-      golang-go git openssh-client \
-    --no-install-recommends \
- && rm -rf /var/lib/apt/lists/*
-
-USER docker