diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 838f28c..79c87f6 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -44,7 +44,9 @@ in
 	  add_header X-Download-Options noopen;
 	  add_header X-Permitted-Cross-Domain-Policies none;
 	  add_header Referrer-Policy no-referrer;
-	  add_header X-Frame-Options sameorigin;		
+	  add_header X-Frame-Options sameorigin;
+	  rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+          rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;		
         '';
 
         locations = {
@@ -69,6 +71,13 @@ in
               location = /.well-known/caldav {
                 return 301 $scheme://$host/remote.php/dav;
               }
+	      location = /.well-known/nodeinfo {
+                return 301 $scheme://$host/index.php/.well-known/nodeinfo;
+              }
+              location = /.well-known/webfinger {
+                return 301 $scheme://$host/index.php/.well-known/webfinger;
+              }
+
               try_files $uri $uri/ =404;
             '';
           };