diff --git a/lotus-land-story/templates/Caddyfile b/lotus-land-story/templates/Caddyfile
index 9f6eae4..dda8486 100644
--- a/lotus-land-story/templates/Caddyfile
+++ b/lotus-land-story/templates/Caddyfile
@@ -9,36 +9,53 @@
 	}
 }
 
+### Auth
+
 # https://www.authelia.com/integration/proxies/caddy/#forwarded-header-trust#trusted-proxies
 (trusted_proxy_list) {
 	trusted_proxies {{ trusted_proxies }}
 }
 
+{% for domain in ("kejadlen.dev", "chislan.family") %}
+auth.{{ domain }} {
+	reverse_proxy authelia:9091 {
+		import trusted_proxy_list
+	}
+}
+{% endfor %}
+
+http://setup {
+	bind tailscale/setup
+	tailscale_auth
+	file_server {
+		root /data/setup
+	}
+}
+
+### Monitoring
+
+# TODO Update this, since it's deprecated
 :2019 {
 	metrics
 }
 
+cadvisor {
+	tls internal
+	bind tailscale/cadvisor
+	reverse_proxy cadvisor:8080
+}
+
 loki.kejadlen.dev {
 	reverse_proxy loki:3100
 }
 
-rss {
+prometheus {
 	tls internal
-	bind tailscale/rss
+	bind tailscale/prometheus
 	tailscale_auth
-	reverse_proxy miniflux:8080 {
-		header_up Remote-User {http.auth.user.tailscale_login}
-	}
-}
-
-prometheus.kejadlen.dev {
 	reverse_proxy prometheus:9090
 }
 
-grafana.kejadlen.dev {
-	reverse_proxy grafana:3000
-}
-
 grafana {
 	tls internal
 	bind tailscale/grafana
@@ -48,18 +65,30 @@ grafana {
 	}
 }
 
-{% for domain in ("kejadlen.dev", "chislan.family") %}
-auth.{{ domain }} {
-	reverse_proxy authelia:9091 {
-		import trusted_proxy_list
+### Services
+
+rss {
+	tls internal
+	bind tailscale/rss
+	tailscale_auth
+	reverse_proxy miniflux:8080 {
+		header_up Remote-User {http.auth.user.tailscale_login}
 	}
 }
-{% endfor %}
+
+search {
+	tls internal
+	bind tailscale/search
+	tailscale_auth
+	reverse_proxy searxng:8080
+}
 
 search.kejadlen.dev {
 	reverse_proxy searxng:8080
 }
 
+### Family
+
 books {
 	tls internal
 	bind tailscale/books
@@ -88,44 +117,28 @@ docs.chislan.family {
 	}
 }
 
-hey.kejadlen.dev
-	reverse_proxy gotosocial:8080
-
-	handle /metrics {
-		respond 404
-	}
-}
-
-cadvisor {
+docs {
 	tls internal
-	bind tailscale/cadvisor
-	reverse_proxy cadvisor:8080
-}
-
-http://setup {
-	bind tailscale/setup
+	bind tailscale/docs
 	tailscale_auth
-	file_server {
-		root /data/setup
+	reverse_proxy paperless-ngx:8000 {
+		header_up Remote-User {http.auth.user.tailscale_user}
 	}
-}
 
-caddytest {
-	log
-	tls internal
-	bind tailscale/caddytest
-	tailscale_auth
-	reverse_proxy localhost:3333 {
-		header_up Remote-User {http.auth.user.tailscale_login}
-		header_up X-Webauth-User {http.auth.user.tailscale_login}
-		header_up X-Tailscale-Tailnet {http.auth.user.tailscale_tailnet}
+	redir /flower /flower/
+	handle /flower/* {
+		reverse_proxy paperless-ngx:5555
 	}
 }
 
-:3333 {
-	log
-	templates
-	respond `Hello, {{ '{{' }}.Req.Header.Get "Remote-User"}} from {{ '{{' }}.Req.Header.Get "X-Tailscale-Tailnet"}}`
+### External
+
+hey.kejadlen.dev
+	reverse_proxy gotosocial:8080
+
+	handle /metrics {
+		respond 404
+	}
 }
 
 # vim: ts=4