diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md
index 3e66d43c..b16f72e9 100644
--- a/.gitlab/issue_templates/Bug Report.md	
+++ b/.gitlab/issue_templates/Bug Report.md	
@@ -3,7 +3,7 @@ If you're requesting a new feature, that isn't part of this project yet,
 then please consider filling out a "Feature Request" instead!
 
 If you need a hand setting up your conduit server, feel free to ask for help in the
-Conduit Matrix Chat: https://matrix.to/#/#conduit:fachschaften.org.
+Conduit Matrix Chat: https://matrix.to/#/#conduit:ahimsa.chat.
 -->
 
 ### Description
diff --git a/README.md b/README.md
index 4d6a9407..4a7547ab 100644
--- a/README.md
+++ b/README.md
@@ -44,14 +44,14 @@ There are still a few important features missing:
 
 1. Look for an issue you would like to work on and make sure no one else is currently working on it.
 2. Tell us that you are working on the issue (comment on the issue or chat in
-   [#conduit:fachschaften.org](https://matrix.to/#/#conduit:fachschaften.org)). If it is more complicated, please explain your approach and ask questions.
+   [#conduit:ahimsa.chat](https://matrix.to/#/#conduit:ahimsa.chat)). If it is more complicated, please explain your approach and ask questions.
 3. Fork the repo, create a new branch and push commits.
 4. Submit a MR
 
 #### Contact
 
 If you have any questions, feel free to
-- Ask in `#conduit:fachschaften.org` on Matrix
+- Ask in `#conduit:ahimsa.chat` on Matrix
 - Write an E-Mail to `conduit@koesters.xyz`
 - Send an direct message to `@timokoesters:fachschaften.org` on Matrix
 - [Open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new)
diff --git a/docs/appservices.md b/docs/appservices.md
index 8ca015a0..24a3b7e9 100644
--- a/docs/appservices.md
+++ b/docs/appservices.md
@@ -2,7 +2,7 @@
 
 ## Getting help
 
-If you run into any problems while setting up an Appservice, write an email to `timo@koesters.xyz`, ask us in [#conduit:fachschaften.org](https://matrix.to/#/#conduit:fachschaften.org) or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
+If you run into any problems while setting up an Appservice, write an email to `timo@koesters.xyz`, ask us in [#conduit:ahimsa.chat](https://matrix.to/#/#conduit:ahimsa.chat) or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
 
 ## Set up the appservice - general instructions
 
diff --git a/docs/deploying/generic.md b/docs/deploying/generic.md
index 1bda1cac..f088f3a0 100644
--- a/docs/deploying/generic.md
+++ b/docs/deploying/generic.md
@@ -3,7 +3,7 @@
 > ## Getting help
 >
 > If you run into any problems while setting up Conduit, write an email to `conduit@koesters.xyz`, ask us
-> in `#conduit:fachschaften.org` or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
+> in `#conduit:ahimsa.chat` or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
 
 ## Installing Conduit
 
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 0d1eee9a..df633b11 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -2029,8 +2029,8 @@ impl Service {
             PduBuilder {
                 event_type: TimelineEventType::RoomMessage,
                 content: to_raw_value(&RoomMessageEventContent::text_html(
-                        format!("## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nFor a list of available commands, send the following message in this room: `@conduit:{}: --help`\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`", services().globals.server_name()),
-                        format!("<h2>Thank you for trying out Conduit!</h2>\n<p>Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.</p>\n<p>Helpful links:</p>\n<blockquote>\n<p>Website: https://conduit.rs<br>Git and Documentation: https://gitlab.com/famedly/conduit<br>Report issues: https://gitlab.com/famedly/conduit/-/issues</p>\n</blockquote>\n<p>For a list of available commands, send the following message in this room: <code>@conduit:{}: --help</code></p>\n<p>Here are some rooms you can join (by typing the command):</p>\n<p>Conduit room (Ask questions and get notified on updates):<br><code>/join #conduit:fachschaften.org</code></p>\n<p>Conduit lounge (Off-topic, only Conduit users are allowed to join)<br><code>/join #conduit-lounge:conduit.rs</code></p>\n", services().globals.server_name()),
+                        format!("## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nFor a list of available commands, send the following message in this room: `@conduit:{}: --help`\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:ahimsa.chat`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`", services().globals.server_name()),
+                        format!("<h2>Thank you for trying out Conduit!</h2>\n<p>Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.</p>\n<p>Helpful links:</p>\n<blockquote>\n<p>Website: https://conduit.rs<br>Git and Documentation: https://gitlab.com/famedly/conduit<br>Report issues: https://gitlab.com/famedly/conduit/-/issues</p>\n</blockquote>\n<p>For a list of available commands, send the following message in this room: <code>@conduit:{}: --help</code></p>\n<p>Here are some rooms you can join (by typing the command):</p>\n<p>Conduit room (Ask questions and get notified on updates):<br><code>/join #conduit:ahimsa.chat</code></p>\n<p>Conduit lounge (Off-topic, only Conduit users are allowed to join)<br><code>/join #conduit-lounge:conduit.rs</code></p>\n", services().globals.server_name()),
                 ))
                 .expect("event is valid, we just created it"),
                 unsigned: None,