diff --git a/Makefile b/Makefile
index f79a6eee..e1cb8e58 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ TOUCH 	  ?= touch
 BUILDDIR := build
 GITHUB_REPO ?= "https://github.com/trapexit/mergerfs"
 
-DEFAULT_RELEASE_SAMPLE := debian:13.amd64
+DEFAULT_RELEASE := debian:13.amd64
 
 ifndef GIT_REPO
 ifneq ($(shell $(GIT) --version 2> /dev/null),)
@@ -368,8 +368,8 @@ endef
 release:
 	$(call build_release,"all")
 release-sample:
-	$(if $(RELEASE_SAMPLE),,$(eval RELEASE_SAMPLE := $(shell ./buildtools/detect-local-target 2>/dev/null)))
-	$(call build_release,$(if $(RELEASE_SAMPLE),$(RELEASE_SAMPLE),$(DEFAULT_RELEASE_SAMPLE)))
+	$(if $(RELEASE),,$(eval RELEASE := $(shell ./buildtools/detect-local-target 2>/dev/null)))
+	$(call build_release,$(if $(RELEASE),$(RELEASE),$(DEFAULT_RELEASE)))
 release-amd64:
 	$(call build_release,"amd64")
 release-arm64:
diff --git a/buildtools/containerfiles/fedora:44.amd64 b/buildtools/containerfiles/fedora:44.amd64
new file mode 100644
index 00000000..736968b2
--- /dev/null
+++ b/buildtools/containerfiles/fedora:44.amd64
@@ -0,0 +1,10 @@
+FROM --platform=amd64 fedora:43 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/fedora:44.arm64 b/buildtools/containerfiles/fedora:44.arm64
new file mode 100644
index 00000000..ca0bc04f
--- /dev/null
+++ b/buildtools/containerfiles/fedora:44.arm64
@@ -0,0 +1,10 @@
+FROM --platform=arm64 fedora:43 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:26.04.amd64 b/buildtools/containerfiles/ubuntu:26.04.amd64
new file mode 100644
index 00000000..b445d3ba
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:26.04.amd64
@@ -0,0 +1,10 @@
+FROM --platform=amd64 ubuntu:26.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/ /
\ No newline at end of file
diff --git a/buildtools/containerfiles/ubuntu:26.04.arm64 b/buildtools/containerfiles/ubuntu:26.04.arm64
new file mode 100644
index 00000000..45db3044
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:26.04.arm64
@@ -0,0 +1,10 @@
+FROM --platform=arm64 ubuntu:26.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/ /
\ No newline at end of file
diff --git a/buildtools/containerfiles/ubuntu:26.04.armhf b/buildtools/containerfiles/ubuntu:26.04.armhf
new file mode 100644
index 00000000..1ba094e3
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:26.04.armhf
@@ -0,0 +1,10 @@
+FROM --platform=armhf ubuntu:26.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/ /
\ No newline at end of file
diff --git a/buildtools/containerfiles/ubuntu:26.04.riscv64 b/buildtools/containerfiles/ubuntu:26.04.riscv64
new file mode 100644
index 00000000..e4e206c7
--- /dev/null
+++ b/buildtools/containerfiles/ubuntu:26.04.riscv64
@@ -0,0 +1,10 @@
+FROM --platform=riscv64 ubuntu:26.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/ /
\ No newline at end of file