diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml
index c2f8acf..f1ff50f 100644
--- a/.github/workflows/container-publish.yml
+++ b/.github/workflows/container-publish.yml
@@ -87,6 +87,10 @@ jobs:
             version: "12.0"
             context: debian
             file: debian/Containerfile-12.0
+          - os: ubuntu
+            version: "24.04"
+            context: ubuntu-24
+            file: ubuntu-24/Containerfile
 
     permissions:
       contents: read
diff --git a/ubuntu-24/Containerfile b/ubuntu-24/Containerfile
new file mode 100644
index 0000000..ce60b1a
--- /dev/null
+++ b/ubuntu-24/Containerfile
@@ -0,0 +1,33 @@
+FROM ubuntu:24.04
+
+
+# ----- install vital packages -----
+ENV DEBIAN_FRONTEND teletype
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	apt-utils \
+	kmod \
+	systemd-sysv \
+	dbus \
+	openssh-client \
+	openssh-server \
+	isc-dhcp-client \
+	pciutils \
+	strace \
+	nfs-common \
+	ethtool\
+	linux-image-generic \
+	ifupdown \
+	ifmetric \
+	netbase && \
+	apt-get autoremove -y && \
+	rm -rf /var/lib/apt/lists/*
+
+
+COPY excludes /etc/warewulf/
+COPY container_exit.sh /etc/warewulf/
+
+CMD [ "/bin/echo", "-e", \
+      "This image is intended to be used with the Warewulf cluster management and", \
+      "\nprovisioning system.", \
+      "\n", \
+      "\nFor more information about Warewulf, visit https://warewulf.org" ]
diff --git a/ubuntu-24/container_exit.sh b/ubuntu-24/container_exit.sh
new file mode 100755
index 0000000..11ce88f
--- /dev/null
+++ b/ubuntu-24/container_exit.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -x
+LANG=C
+LC_CTYPE=C
+export LANG LC_CTYPE
+apt-get clean
diff --git a/ubuntu-24/excludes b/ubuntu-24/excludes
new file mode 100644
index 0000000..5be2a7e
--- /dev/null
+++ b/ubuntu-24/excludes
@@ -0,0 +1 @@
+/boot/