diff --git a/Caddyfile b/Caddyfile
index 4c5cba56..14bd1f22 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -13,14 +13,22 @@
         rewrite * {re.analytics_match.2}
         reverse_proxy traffic-analytics:3000
     }
-    
-    # Proxy activitypub requests with any prefix (e.g. /.ghost/activitypub/ or /blog/.ghost/activitypub/)
-    @activitypub_paths path_regexp activitypub_match ^(.*)/\.ghost/activitypub(.*)$
-    handle @activitypub_paths {
+
+    # ActivityPub
+    # Proxy activitypub requests /.ghost/activitypub/
+    handle /.ghost/activitypub/* {
+        reverse_proxy activitypub:8080
+    }
+
+    handle /.well-known/webfinger {
+        reverse_proxy activitypub:8080
+    }
+
+    handle /.well-known/nodeinfo {
         reverse_proxy activitypub:8080
     }
 
-    # Default proxy to Ghost
+    # Default proxy everything else to Ghost
     handle {
         reverse_proxy ghost:2368
     }