diff --git a/nginx.conf b/nginx.conf
index f4fdb1a..a16e925 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -17,15 +17,18 @@ http {
             index  index.html index.htm;
         }
 
-        location /.well-known {
-            alias /usr/share/nginx/html/.well-known;
+        location /.well-known/matrix/server {
+            access_log off;
+            add_header Access-Control-Allow-Origin *;
+            default_type application/json;
+            return 200 '{"m.server": "matrix.depeuter.dev:443"}';
+        }
+
+        location /.well-known/matrix/client {
+            access_log off;
+            add_header Access-Control-Allow-Origin *;
+            default_type application/json;
+            return 200 '{"m.homeserver": {"base_url": "https://matrix.depeuter.dev"}}';
         }
     }
-
-    server {
-        listen 12345;
-        listen [::]:12345;
-        server_name up.depeuter.dev;
-        proxy_pass http://192.168.0.11/9301;
-    }
 }
diff --git a/var/www/.well-known/matrix/client b/var/www/.well-known/matrix/client
deleted file mode 100644
index 4bcb3a2..0000000
--- a/var/www/.well-known/matrix/client
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "m.homeserver": {
-    "base_url": "https://matrix.depeuter.dev"
-  }
-}
diff --git a/var/www/.well-known/matrix/server b/var/www/.well-known/matrix/server
deleted file mode 100644
index b1c1bc8..0000000
--- a/var/www/.well-known/matrix/server
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "m.server": "matrix.depeuter.dev:443"
-}
\ No newline at end of file