diff --git a/acme_rsync_caladan/Makefile b/acme_rsync_caladan/Makefile
index c616857..758a972 100644
--- a/acme_rsync_caladan/Makefile
+++ b/acme_rsync_caladan/Makefile
@@ -3,50 +3,24 @@ WD=/var/lib/dags/acme_rsync
 .PHONY: all refresh_pg sync_certs
 
 NGINX_RELOAD=$(WD)/nginx_reload
-PROSODY_IMPORT_XMPP=$(WD)/prosody_import_xmpp
-PROSODY_IMPORT_MONOTREMATA=$(WD)/prosody_import_monotremata
-PROSODY_IMPORT=$(WD)/prosody_import
 PROSODY_RELOAD=$(WD)/prosody_reload
 
 all: sync_certs $(NGINX_RELOAD) $(PROSODY_RELOAD) refresh_pg
 
 ###############################################################################
 
-CERTS_PATH=/srv/certs/acme
-
-MONOTREMATA_DOMAIN=monotremata.xyz
-MONOTREMATA_PATH=$(CERTS_PATH)/$(MONOTREMATA_DOMAIN)
-MONOTREMATA_CERT=$(MONOTREMATA_PATH)/fullchain.cer
-MONOTREMATA_KEY=$(MONOTREMATA_PATH)/$(MONOTREMATA_DOMAIN).key
-
-NARWHAL_DOMAIN=narwhal.monotremata.xyz
-NARWHAL_PATH=$(CERTS_PATH)/$(NARWHAL_DOMAIN)
-NARWHAL_CERT=$(NARWHAL_PATH)/fullchain.cer
-NARWHAL_KEY=$(NARWHAL_PATH)/$(NARWHAL_DOMAIN).key
-
-CALADAN_DOMAIN=caladan.monotremata.xyz
-CALADAN_PATH=$(CERTS_PATH)/$(CALADAN_DOMAIN)
-CALADAN_CERT=$(CALADAN_PATH)/fullchain.cer
-CALADAN_KEY=$(CALADAN_PATH)/$(CALADAN_DOMAIN).key
-
-XMPP_DOMAIN=xmpp.monotremata.xyz
-XMPP_PATH=$(CERTS_PATH)/$(XMPP_DOMAIN)
-XMPP_CERT=$(XMPP_PATH)/fullchain.cer
-XMPP_KEY=$(XMPP_PATH)/$(XMPP_DOMAIN).key
+DOMAIN=monotremata.xyz
+CERT_PATH=/srv/certs/$(DOMAIN)
+CERT=$(CERT_PATH)/fullchain.cer
+KEY=$(CERT_PATH)/$(DOMAIN).key
 
 ###############################################################################
 # Sync the certificates using rsync. Because `sync` is a phony
 # target, it will be run each time, but the certificate files will only be
 # updated if a renewal happens
 
-$(MONOTREMATA_CERT): sync_certs
-$(MONOTREMATA_KEY): sync_certs
-$(NARWHAL_CERT): sync_certs
-$(NARWHAL_KEY): sync_certs
-$(CALADAN_CERT): sync_certs
-$(CALADAN_KEY): sync_certs
-$(XMPP_CERT): sync_certs
-$(XMPP_KEY): sync_certs
+$(CERT): sync_certs
+$(KEY): sync_certs
 
 REMOTE_ACME_PATH=rsync://user@narwhal/acme
 RSYNCD_PASSWD=/srv/secrets/rsyncd_password
@@ -82,31 +56,21 @@ $(NGINX_RELOAD): $(MONOTREMATA_CERT) $(MONOTREMATA_KEY)
 
 PROSODY_CERTS_PATH=/srv/volumes/xmpp/certs
 
-PROSODY_MONOTREMATA_CERT=$(PROSODY_CERTS_PATH)/monotremata.xyz.crt
-PROSODY_MONOTREMATA_KEY=$(PROSODY_CERTS_PATH)/monotremata.xyz.key
-PROSODY_XMPP_CERT=$(PROSODY_CERTS_PATH)/xmpp.monotremata.xyz.crt
-PROSODY_XMPP_KEY=$(PROSODY_CERTS_PATH)/xmpp.monotremata.xyz.key
+PROSODY_CERT=$(PROSODY_CERTS_PATH)/monotremata.xyz.crt
+PROSODY_KEY=$(PROSODY_CERTS_PATH)/monotremata.xyz.key
 
 PROSODY_UID=101
 PROSODY_GID=102
 
-PROSODY_INSTALL=install -o $(PROSODY_UID) -g $(PROSODY_GID)
-PROSODY_INSTALL_CERT=$(PROSODY_INSTALL) -m 644 $< $@
-PROSODY_INSTALL_KEY=$(PROSODY_INSTALL) -m 600 $< $@
+$(PROSODY_CERT): $(CERT)
+	install -o $(PROSODY_UID) -g $(PROSODY_GID) -m 644 $< $@
 
-$(PROSODY_MONOTREMATA_CERT): $(MONOTREMATA_CERT)
-	$(PROSODY_INSTALL_CERT)
-$(PROSODY_MONOTREMATA_KEY): $(MONOTREMATA_KEY)
-	$(PROSODY_INSTALL_KEY)
-
-$(PROSODY_XMPP_CERT): $(XMPP_CERT)
-	$(PROSODY_INSTALL_CERT)
-$(PROSODY_XMPP_KEY): $(XMPP_KEY)
-	$(PROSODY_INSTALL_KEY)
+$(PROSODY_KEY): $(KEY)
+	install -o $(PROSODY_UID) -g $(PROSODY_GID) -m 600 $< $@
 
 PROSODY_COMPOSE_FILE=/srv/services/xmpp/docker-compose.yml
 
-$(PROSODY_RELOAD): $(PROSODY_MONOTREMATA_CERT) $(PROSODY_MONOTREMATA_KEY) $(PROSODY_XMPP_CERT) $(PROSODY_XMPP_KEY)
+$(PROSODY_RELOAD): $(PROSODY_CERT) $(PROSODY_KEY)
 	mkdir -p $(@D)
 	docker-compose --file $(PROSODY_COMPOSE_FILE) exec \
 		prosody prosodyctl reload
@@ -120,11 +84,11 @@ PG_SSL_PATH=/srv/volumes/postgres/ssl
 PG_CERT=$(PG_SSL_PATH)/server.crt
 PG_KEY=$(PG_SSL_PATH)/server.key
 
-$(PG_CERT): $(CALADAN_CERT)
+$(PG_CERT): $(CERT)
 	mkdir -p $(@D)
 	rsync --copy-links $< $@
 
-$(PG_KEY): $(CALADAN_KEY)
+$(PG_KEY): $(KEY)
 	mkdir -p $(@D)
 	rsync --copy-links $< $@