diff --git a/.well-known/matrix/client b/.well-known/matrix/client
index f81467a..d51c473 100644
--- a/.well-known/matrix/client
+++ b/.well-known/matrix/client
@@ -1,5 +1,5 @@
 {
     "m.homeserver": {
-	"base_url":"https://mtx.chaospott.de"
+	"base_url":"https://chaospott.de:8448"
 	}
 }
diff --git a/.well-known/matrix/server b/.well-known/matrix/server
index 8619344..a984dd5 100644
--- a/.well-known/matrix/server
+++ b/.well-known/matrix/server
@@ -1,3 +1,3 @@
 {
-    "m.server": "mtx.chaospott.de:443"
+    "m.server": "chaospott.de:8448"
 }
diff --git a/_includes/footer.html b/_includes/footer.html
index b1f549c..20ac916 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -27,7 +27,7 @@
     <div class="col-md-4">
       <p><i class="fab fa-twitter"></i> <a href="https://twitter.com/chaospott">@chaospott</a></p>
       <p><span class="fa fa-inbox"></span> <a href="https://lists.chaospott.de/postorius/lists/discuss.lists.chaospott.de/"><span id="e176307554">[javascript protected email address]</span><script type="text/javascript">/*<![CDATA[*/eval("var a=\"QF7fPdHKm6eh8@I0vEyYxwMALU3l_BGgD.X4+jJutCVaS2czWkpq1i5-boORT9snNrZ\";var b=a.split(\"\").sort().join(\"\");var c=\"SkRa9RRFR9VRaOkV2@1kRTR7aWC-Rb-TT7S2\";var d=\"\";for(var e=0;e<c.length;e++)d+=b.charAt(a.indexOf(c.charAt(e)));document.getElementById(\"e176307554\").innerHTML=d")/*]]>*/</script></a></p>
-      <p><span class="fa fa-comments"></span> 	Matrix: <a href="https://matrix.to/#/#chaospott-space:matrix.chaospott.de">#chaospott-space</a></p>
+      <p><span class="fa fa-comments"></span> 	Matrix: <a href="https://matrix.to/#/#chaospott-space:chaospott.de">#chaospott-space</a></p>
       <p>
         <i class="fab fa-github"></i> <a href="https://github.com/c3e">c3e</a> | <i class="fab fa-gitlab"></i> <a href="https://gitlab.com/c3e">c3e</a>
       </p>
diff --git a/contact.md b/contact.md
index 4a0294c..350829b 100644
--- a/contact.md
+++ b/contact.md
@@ -32,4 +32,4 @@ Zusätzlich sind wir auch auf Mastodon und Twitter zu finden. Auf beiden Plattfo
 
 ## Matrix
 
-Wir chatten über Matrix. Du findest unseren Matrix-Space unter <a href="https://matrix.to/#/#chaospott-space:matrix.chaospott.de">#chaospott-space auf matrix.chaospott.de</a>.
+Wir chatten über Matrix. Du findest unseren Matrix-Space unter <a href="https://matrix.to/#/#chaospott-space:chaospott.de">#chaospott-space auf chaospott.de</a>.