diff --git a/SECURITY.md b/SECURITY.md
index bdf4bc608c..6f39d43495 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -17,7 +17,7 @@ Send a private report that includes:
 
 ## Security Contacts
 
-- Matrix: [@kevinveenbirkenbach:infinito.nexus](https://matrix.to/#/@kevinveenbirkenbach:infinito.nexus)
+- Matrix: @kevinveenbirkenbach:infinito.nexus
 - Email: [kevinveenbirkenbach@infinito.nexus](mailto:kevinveenbirkenbach@infinito.nexus)
 - Phone: [+49 178 179 8023](tel:+491781798023)
 
diff --git a/docs/agents/meta/about.md b/docs/agents/meta/about.md
index 78b36570fc..ed11c913fc 100644
--- a/docs/agents/meta/about.md
+++ b/docs/agents/meta/about.md
@@ -2,4 +2,4 @@
 
 - You MUST use [agents.md](https://agents.md/) as the external meta reference for AGENTS files.
 - You MUST use the AI forum at [s.infinito.nexus/aihub](https://s.infinito.nexus/aihub) as the companion guidance and support resource.
-- For community support, join the Matrix group [#ai:infinito.nexus](https://matrix.to/#/#ai:infinito.nexus).
+- For community support, join the Matrix group #ai:infinito.nexus.
diff --git a/docs/contributing/documentation.md b/docs/contributing/documentation.md
index bcdb9833d6..508b25ca00 100644
--- a/docs/contributing/documentation.md
+++ b/docs/contributing/documentation.md
@@ -32,7 +32,7 @@ You MUST use [RFC 2119](https://www.rfc-editor.org/rfc/rfc2119) keywords in all
 | Web link | `https://docs.infinito.example/` | `docs.infinito.example`, `here`, a descriptive label, or `setup.md` |
 | File link | `docs/contributing/workflow.md` | `workflow.md` or `Contribution Flow` |
 | Email | `mailto:hello@infinito.nexus` | `hello@infinito.nexus` |
-| Matrix | `https://matrix.to/#/@user:infinito.nexus` | `@user:infinito.nexus` |
+| Matrix | `[#room:infinito.nexus](https://some-url.example/)` | `@user:infinito.nexus` |
 | Phone | `tel:+491234567890` | `+49 123 456 7890` |
 
 ## Semantics and Writing ✍️
diff --git a/docs/contributing/tools/agents/common.md b/docs/contributing/tools/agents/common.md
index 36a193e1bd..9144b9517e 100644
--- a/docs/contributing/tools/agents/common.md
+++ b/docs/contributing/tools/agents/common.md
@@ -12,4 +12,4 @@ AI assistants are welcome, but they MUST follow the same workflow as humans.
 For tool-specific configuration and additional instructions, see [CLAUDE.md](../../../../CLAUDE.md) and [GEMINI.md](../../../../GEMINI.md).
 For a full reference of permitted Claude Code operations and their security rationale, see [claude/](claude/README.md).
 
-For further support, visit the AI forum at [s.infinito.nexus/aihub](https://s.infinito.nexus/aihub) or join the Matrix group [#ai:infinito.nexus](https://matrix.to/#/#ai:infinito.nexus).
+For further support, visit the AI forum at [s.infinito.nexus/aihub](https://s.infinito.nexus/aihub) or join the Matrix group #ai:infinito.nexus.