diff --git a/homeserver.yaml b/homeserver.yaml
index e8d1db8..7e62fbb 100644
--- a/homeserver.yaml
+++ b/homeserver.yaml
@@ -90,3 +90,5 @@ password_config:
    enabled: true
 
 encryption_enabled_by_default_for_room_type: "all"
+
+serve_server_wellknown: true
diff --git a/manifests/prod/delegation.yaml b/manifests/prod/delegation.yaml
index c011189..a54adc8 100644
--- a/manifests/prod/delegation.yaml
+++ b/manifests/prod/delegation.yaml
@@ -15,8 +15,15 @@ spec:
     - host: gmoker.com
       http:
         paths:
-          - path: /.well-known/matrix/
-            pathType: Prefix
+          - path: /.well-known/matrix/server
+            pathType: Exact
+            backend:
+              service:
+                name: app
+                port:
+                  name: http
+          - path: /.well-known/matrix/client
+            pathType: Exact
             backend:
               service:
                 name: delegation
@@ -45,13 +52,7 @@ data:
   default.conf: |
     server {
       listen 80;
-      location / {
-        return 200;
-      }
-      location /.well-known/matrix/server {
-        default_type application/json;
-        return 200 '{"m.server": "$BASE_URL:443"}';
-      }
+
       location /.well-known/matrix/client {
         default_type application/json;
         return 200 '{"m.homeserver": { "base_url": "https://$BASE_URL" }}';
@@ -82,7 +83,7 @@ spec:
               containerPort: 80
           volumeMounts:
             - name: delegation
-              mountPath: /etc/nginx/conf.d
+              mountPath: /etc/nginx/conf.d/
               readOnly: true
       volumes:
         - name: delegation