diff --git a/Compose/web-proxy/ns4/conf.d/nehe.sr.conf b/Compose/web-proxy/ns4/conf.d/nehe.sr.conf
index 289bb2a9da44814ed3a0aeb23572a24f1076296a..2b23fc1c5e0b528c9cb5c71779b902adca143f33 100644
--- a/Compose/web-proxy/ns4/conf.d/nehe.sr.conf
+++ b/Compose/web-proxy/ns4/conf.d/nehe.sr.conf
@@ -6,6 +6,7 @@ server {
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
     include     snippets/security-txt.conf;
+    include     snippets/matrix-well-known.conf;
     include     snippets/www-acme-challenge.conf;
     include     snippets/redirect-www.conf;
 }
@@ -19,6 +20,7 @@ server {
     include     snippets/security-txt.conf;
     include     snippets/ssl-legacy.conf;
     include     snippets/nextcloud-well-known.conf;
+    include     snippets/matrix-well-known.conf;
     include     snippets/activesync.conf;
     include     snippets/redirect-www.conf;
 }
diff --git a/Compose/web-proxy/ns4/conf.d/nehes.co.conf b/Compose/web-proxy/ns4/conf.d/nehes.co.conf
index db751ddfaabb0c6db942e6ca6f204870bdcf0980..8cb6ecc02fd1e089985db498147cfc8af33e7b38 100644
--- a/Compose/web-proxy/ns4/conf.d/nehes.co.conf
+++ b/Compose/web-proxy/ns4/conf.d/nehes.co.conf
@@ -6,6 +6,7 @@ server {
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
     include     snippets/security-txt.conf;
+    include     snippets/matrix-well-known.conf;
     include     snippets/www-acme-challenge.conf;
     include     snippets/redirect-www.conf;
 }
@@ -18,6 +19,7 @@ server {
     include     snippets/ads-txt.conf;
     include     snippets/security-txt.conf;
     include     snippets/ssl-legacy.conf;
+    include     snippets/matrix-well-known.conf;
     include     snippets/nextcloud-well-known.conf;
     include     snippets/activesync.conf;
     include     snippets/redirect-www.conf;
diff --git a/Compose/web-proxy/ns4/conf.d/shore.co.il.conf b/Compose/web-proxy/ns4/conf.d/shore.co.il.conf
index 24d3c4b5bdc90b6d59fb0a254a9027cd043f345e..af5858a71392f77368a14e23367af9548d7fdb83 100644
--- a/Compose/web-proxy/ns4/conf.d/shore.co.il.conf
+++ b/Compose/web-proxy/ns4/conf.d/shore.co.il.conf
@@ -8,6 +8,7 @@ server {
     include     snippets/robots-allow-all.conf;
     include     snippets/ads-txt.conf;
     include     snippets/security-txt.conf;
+    include     snippets/matrix-well-known.conf;
     include     snippets/www-acme-challenge.conf;
     include     snippets/redirect-www.conf;
 
@@ -23,9 +24,9 @@ server {
     include     snippets/security-txt.conf;
     include     snippets/ssl-legacy.conf;
     include     snippets/nextcloud-well-known.conf;
+    include     snippets/matrix-well-known.conf;
     include     snippets/activesync.conf;
     include     snippets/redirect-www.conf;
-    include     snippets/matrix-well-known.conf;
 
     location = /        { return 301 https://www.shore.co.il/blog/; }
 }
diff --git a/Compose/web-proxy/ns4/snippets/matrix-well-known.conf b/Compose/web-proxy/ns4/snippets/matrix-well-known.conf
new file mode 100644
index 0000000000000000000000000000000000000000..beb47c942dc93369a849351d3b9fd97b766d6a72
--- /dev/null
+++ b/Compose/web-proxy/ns4/snippets/matrix-well-known.conf
@@ -0,0 +1,21 @@
+# vim: ft=nginx
+location = /.well-known/matrix/server {
+    if ($scheme = http) {
+        return 301 https://$host$request_uri;
+    }
+    if ($scheme = https) {
+        add_header Content-Type "application/json; charset=utf-8";
+        return 200 "{\"m.server\": \"matrix.shore.co.il:443\"}";
+    }
+}
+
+location = /.well-known/matrix/client {
+    if ($scheme = http) {
+        return 301 https://$host$request_uri;
+    }
+    if ($scheme = https) {
+        add_header Content-Type "application/json; charset=utf-8";
+        add_header Access-Control-Allow-Origin *;
+        return 200 "{\"m.homeserver\": { \"base_url\": \"https://matrix.shore.co.il\" } }";
+    }
+}