diff --git a/buildtools/containerfiles/ubuntu:25.04.amd64 b/buildtools/containerfiles/ubuntu:25.04.amd64
new file mode 100644
index 00000000..1d73b7f5
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:25.04.amd64
@@ -0,0 +1,10 @@
+FROM --platform=amd64 ubuntu:25.04 as build
+COPY install-build-pkgs build-mergerfs /tmp/
+RUN /tmp/install-build-pkgs
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH
+
+FROM scratch
+COPY --from=build /build/ /
diff --git a/buildtools/containerfiles/ubuntu:25.04.arm64 b/buildtools/containerfiles/ubuntu:25.04.arm64
new file mode 100644
index 00000000..eaae2f49
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:25.04.arm64
@@ -0,0 +1,10 @@
+FROM --platform=arm64 ubuntu:25.04 as build
+COPY install-build-pkgs build-mergerfs /tmp/
+RUN /tmp/install-build-pkgs
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH
+
+FROM scratch
+COPY --from=build /build/ /
diff --git a/buildtools/containerfiles/ubuntu:25.04.armhf b/buildtools/containerfiles/ubuntu:25.04.armhf
new file mode 100644
index 00000000..47493442
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:25.04.armhf
@@ -0,0 +1,10 @@
+FROM --platform=armhf ubuntu:25.04 as build
+COPY install-build-pkgs build-mergerfs /tmp/
+RUN /tmp/install-build-pkgs
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH
+
+FROM scratch
+COPY --from=build /build/ /
diff --git a/buildtools/containerfiles/ubuntu:25.04.riscv64 b/buildtools/containerfiles/ubuntu:25.04.riscv64
new file mode 100644
index 00000000..1ef10e28
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:25.04.riscv64
@@ -0,0 +1,10 @@
+FROM --platform=riscv64 ubuntu:25.04 as build
+COPY install-build-pkgs build-mergerfs /tmp/
+RUN /tmp/install-build-pkgs
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH
+
+FROM scratch
+COPY --from=build /build/ /
diff --git a/buildtools/target-containers.txt b/buildtools/target-containers.txt
index 2e03708f..f6f78928 100644
--- a/buildtools/target-containers.txt
+++ b/buildtools/target-containers.txt
@@ -33,3 +33,7 @@ ubuntu:24.04 amd64
 ubuntu:24.04 arm64
 ubuntu:24.04 armhf
 ubuntu:24.04 riscv64
+ubuntu:25.04 amd64
+ubuntu:25.04 arm64
+ubuntu:25.04 armhf
+ubuntu:25.04 riscv64