diff --git a/Containerfile b/Containerfile
index 79726a1..b5756f7 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6-bookworm as build
+FROM docker.io/golang:1.21.6-bookworm as build
 
 ENV CGO_ENABLED=0 \
 	GOOS=linux \
diff --git a/Makefile b/Makefile
index 1cc924e..cfe7741 100644
--- a/Makefile
+++ b/Makefile
@@ -38,4 +38,9 @@ install:
 	cp -f $(man_pages) $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
 	[ -f $(DESTDIR)$(config_path) ] || cp -f config.in $(DESTDIR)$(config_path)
 
+container:
+	buildah manifest create soju-multiarch
+	buildah bud --tag soju:latest --manifest soju-multiarch --arch amd64 .
+	buildah bud --tag soju:latest --manifest soju-multiarch --arch arm64 .
+
 .PHONY: soju sojudb sojuctl clean install
diff --git a/doc/soju.1.scd b/doc/soju.1.scd
index 00723ae..d2741d7 100644
--- a/doc/soju.1.scd
+++ b/doc/soju.1.scd
@@ -166,6 +166,10 @@ The following directives are supported:
 	Supported drivers:
 
 	- _fs_ stores uploaded files on disk. _source_ is required.
+	- _s3_ stores uploaded files in an s3-compatible api. _source_ is required and should be <s3 endpoint>/<bucket name>.
+
+*file-cdn* <url>
+	Set the base url/cdn for file uploads, useful if using s3.
 
 *http-origin* <patterns...>
 	List of allowed HTTP origins for WebSocket listeners. The parameters are