diff --git a/.github/workflows/build-publish-containers.yml b/.github/workflows/build-publish-containers.yml
index 75b2729..356bfef 100644
--- a/.github/workflows/build-publish-containers.yml
+++ b/.github/workflows/build-publish-containers.yml
@@ -32,6 +32,7 @@ jobs:
           - ubuntu-20.04
           - ubuntu-20.04-python2
           - ubuntu-22.04
+          - ubuntu-24.04
       fail-fast: false
     steps:
       - name: Check out the repo
diff --git a/README.md b/README.md
index 349c187..051b450 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Containers for testing EasyBuild, built automatically for `x86_64` and `aarch64`
 * `ubuntu-20.04`: [recipe](https://github.com/easybuilders/easybuild-containers/blob/main/ubuntu-20.04/Dockerfile), [image @ ghcr.io](https://github.com/easybuilders/easybuild-containers/pkgs/container/ubuntu-20.04)
 * `ubuntu-20.04-python2`: [recipe](https://github.com/easybuilders/easybuild-containers/blob/main/ubuntu-20.04-python2/Dockerfile), [image @ ghcr.io](https://github.com/easybuilders/easybuild-containers/pkgs/container/ubuntu-20.04-python2)
 * `ubuntu-22.04`: [recipe](https://github.com/easybuilders/easybuild-containers/blob/main/ubuntu-22.04/Dockerfile), [image @ ghcr.io](https://github.com/easybuilders/easybuild-containers/pkgs/container/ubuntu-22.04)
+* `ubuntu-24.04`: [recipe](https://github.com/easybuilders/easybuild-containers/blob/main/ubuntu-24.04/Dockerfile), [image @ ghcr.io](https://github.com/easybuilders/easybuild-containers/pkgs/container/ubuntu-24.04)
 
 ## Usage with Singularity
 
diff --git a/ubuntu-24.04/Dockerfile b/ubuntu-24.04/Dockerfile
new file mode 100644
index 0000000..622c0f7
--- /dev/null
+++ b/ubuntu-24.04/Dockerfile
@@ -0,0 +1,12 @@
+FROM ubuntu:24.04
+RUN useradd -ms /bin/bash easybuild
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt update \
+&& apt install -y curl python3 python3-pip \
+&& LMOD_VERSION=8.7.37 \
+&& curl -OL https://github.com/surak/Lmod/releases/download/${LMOD_VERSION}/lmod_${LMOD_VERSION}_all.deb \
+&& apt install -y ./lmod_${LMOD_VERSION}_all.deb
+# debianutils provides 'which' command
+RUN apt install -y bzip2 debianutils diffutils file gcc g++ git gzip libibverbs-dev openssl libssl-dev make patch sudo tar unzip xz-utils
+# Installing system-wide Python packages is not possible anymore, c.f. PEP 668
+# RUN python3 -m pip install archspec