diff --git a/Makefile b/Makefile
index af89375..dc9d77b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
-images=ansible backup buku ddclient git-daemon gitolite gitolite-pystagit rss-bridge sassc syncthing tasks tor vdirsyncer xandikos
+images=agate ansible backup buku ddclient git-daemon gitolite gitolite-pystagit rss-bridge sassc syncthing tasks tor vdirsyncer xandikos
 .PHONY: all $(images)
 all: $(images)
 
 BUILD = make -C $@
 
+agate:
+	$(BUILD)
+
 ansible:
 	$(BUILD)
 
diff --git a/README.md b/README.md
index 47f53c4..849b611 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ useful.
 
 (many are self-explanatory)
 
+* agate
 * ansible
 * backup: simple image used in some of my backup daemons
 * buku: buku and bukuserver
diff --git a/agate/Dockerfile b/agate/Dockerfile
new file mode 100644
index 0000000..3adf34e
--- /dev/null
+++ b/agate/Dockerfile
@@ -0,0 +1,21 @@
+FROM alpine:3.13
+
+RUN apk add --no-cache --virtual .build-deps cargo && \
+    apk add --no-cache libgcc && \
+    cargo install agate && \
+    apk del .build-deps && \
+    mv /root/.cargo/bin/agate /usr/local/bin/agate && \
+    addgroup \
+        --gid 10001 \
+        agate && \
+    adduser \
+        --uid 10000 \
+        --home /srv \
+        --ingroup agate \
+        --disabled-password \
+        --shell /sbin/nologin \
+        agate
+
+WORKDIR /srv
+USER agate
+ENTRYPOINT ["agate"]
diff --git a/agate/Makefile b/agate/Makefile
new file mode 100644
index 0000000..a95c60c
--- /dev/null
+++ b/agate/Makefile
@@ -0,0 +1,10 @@
+USERNAME = rilla
+IMG_NAME = agate
+
+.PHONY: build build-nc
+
+build: Dockerfile
+	docker build -t $(USERNAME)/$(IMG_NAME) .
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .