diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0d63a5e..4523f6c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,6 +21,7 @@ jobs:
       matrix:
         distro:
           - alpine
+          - alpine-edge
           - archlinux
           - debian-bookworm
           - debian-bullseye
diff --git a/README.md b/README.md
index 5da4c72..9bead44 100644
--- a/README.md
+++ b/README.md
@@ -38,14 +38,16 @@ Example: `make REPO=../dunst.git ci-run-alpine`
 
 # Images
 
-- ArchLinux Latest (`archlinux`)
 - Alpine Latest (`alpine`)
+- Alpine Edge (`alpine-edge`)
+- ArchLinux Latest (`archlinux`)
 - Debian Bookworm (`debian-bookworm`)
 - Debian Bullseye (`debian-bullseye`)
 - Debian Buster (`debian-buster`)
-- Fedora 39 (`fedora39`)
+- Fedora 40 (`fedora40`)
 - Ubuntu 20.04 (`ubuntu-focal`)
 - Ubuntu 22.04 (`ubuntu-jammy`)
+- Ubuntu 24.04 (`ubuntu-noble`)
 
 CentOS is not supported, as [basic libraries are missing on CentOS](https://unix.stackexchange.com/questions/115304/dunst-notifier-on-centos).
 
diff --git a/ci/Dockerfile.alpine b/ci/Dockerfile.alpine
index fa25d7e..af0b60f 100644
--- a/ci/Dockerfile.alpine
+++ b/ci/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.21.0
 
 RUN apk add --no-cache \
         bash \
diff --git a/ci/Dockerfile.alpine-edge b/ci/Dockerfile.alpine-edge
new file mode 100644
index 0000000..1aec840
--- /dev/null
+++ b/ci/Dockerfile.alpine-edge
@@ -0,0 +1,62 @@
+FROM alpine:edge
+
+RUN apk add --no-cache \
+        bash \
+        cairo \
+        cairo-dev \
+        clang \
+        compiler-rt \
+        curl \
+        dbus \
+        dbus-dev \
+        findutils \
+        # it seems like some font needs to be available for pango to properly
+        # work - otherwise valgrind complains about jumps depending on
+        # uninitialized values
+        font-dejavu \
+        gcc \
+        git \
+        glib \
+        glib-dev \
+        libnotify \
+        libnotify-dev \
+        librsvg \
+        libxft \
+        libxft-dev \
+        libxinerama \
+        libxinerama-dev \
+        libxrandr \
+        libxrandr-dev \
+        libxscrnsaver \
+        libxscrnsaver-dev \
+        make \
+        musl-dev \
+        pango \
+        pango-dev \
+        valgrind \
+        wayland \
+        wayland-dev \
+        wayland-libs-client \
+        wayland-libs-cursor \
+        wayland-libs-server \
+        wayland-protocols \
+ && true
+
+RUN set -ex; \
+    apk add --no-cache \
+        gcovr \
+        gzip \
+        perl \
+        perl-capture-tiny \
+        perl-datetime \
+        perl-io-gzip \
+        perl-json \
+        ; \
+    git clone https://github.com/linux-test-project/lcov.git; \
+    make -C lcov -j install; \
+    rm lcov -rf; \
+    :;
+
+ADD entrypoint.sh /srv/entrypoint
+
+ENTRYPOINT ["/srv/entrypoint"]