diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 25ea8abd9..f209311d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ By submitting code, documentation or artwork you agree that it will be licensed
 
 ## Security Vulnerability Disclosure
 
-Create an issue on https://gitlab.com/bashrc2/epicyon/issues. If the vulnerability is especially sensitive then send an XMPP message to **bob@libreserver.org** or a Matrix message to **@bob:matrix.libreserver.org**.
+Create an issue on https://gitlab.com/bashrc2/epicyon/issues. If the vulnerability is especially sensitive then send an XMPP message to **bob@libreserver.org** or a Matrix message to **@bob:conduit.libreserver.org**.
 
 ## Code of Conduct
 
diff --git a/README.md b/README.md
index a0de97c4a..c17c7741f 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Epicyon is for people who are tired of *big anything* and just want to DIY their
 
 [User Manual](manual/manual.epub) - [Keyboard navigation](README_keyboard_navigation.md) - [Project Goals](README_goals.md) - [Commandline interface](README_commandline.md) - [Customizations](README_customizations.md) - [Software Architecture](README_architecture.md) - [Code of Conduct](code-of-conduct.md) - [Principles of Unity](principlesofunity.md) - [C2S Desktop Client](README_desktop_client.md) - [Coding Style](README_coding_style.md)
 
-Matrix room: **#epicyon:matrix.libreserver.org**
+Matrix room: **#epicyon:conduit.libreserver.org**
 
 Includes emojis designed by [OpenMoji](https://openmoji.org) – the open-source emoji and icon project. License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0). Blob Cat Emoji and Meowmoji were made by Nitro Blob Hub, licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). [Digital Pets emoji](https://opengameart.org/content/16x16-emotes-for-rpgs-and-digital-pets) were made by Tomcat94 and licensed under CC0.
 
diff --git a/code-of-conduct.md b/code-of-conduct.md
index 5dc766847..e288ba402 100644
--- a/code-of-conduct.md
+++ b/code-of-conduct.md
@@ -52,7 +52,7 @@ If you're raising concerns about something or someone, there must be demonstrabl
 
 This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process.
 
-Complaints should be either reported in the Matrix chat room **#epicyon:matrix.libreserver.org** or sent to bob@libreserver.org, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence.
+Complaints should be either reported in the Matrix chat room **#epicyon:conduit.libreserver.org** or sent to bob@libreserver.org, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence.
 
 ## In case of violations