diff --git a/infrastructure/caddy/Caddyfile b/infrastructure/caddy/Caddyfile
index 1364ee2..8a120fe 100644
--- a/infrastructure/caddy/Caddyfile
+++ b/infrastructure/caddy/Caddyfile
@@ -1,5 +1,7 @@
 {
-	metrics
+	metrics {
+		per_host
+	}
 }
 
 (basic-auth) {
diff --git a/infrastructure/prometheus/prometheus.yaml b/infrastructure/prometheus/prometheus.yaml
index 0dfe8aa..2ab60b3 100644
--- a/infrastructure/prometheus/prometheus.yaml
+++ b/infrastructure/prometheus/prometheus.yaml
@@ -37,4 +37,4 @@ scrape_configs:
   # Caddy
   - job_name: caddy
     static_configs:
-      - targets: ["caddy:8080"]
+      - targets: ["caddy:2019"]