diff --git a/content/docs/infrastructure/matrix/public-server-list.md b/content/docs/infrastructure/matrix/public-server-list.md
index 40568b1..1d16236 100644
--- a/content/docs/infrastructure/matrix/public-server-list.md
+++ b/content/docs/infrastructure/matrix/public-server-list.md
@@ -12,15 +12,20 @@ Depending on your requirements, you'd might want to choose a provider bridging t
 
 Provider | Homeserver URL | Status page | Special features (selection)
 ---------|----------------|-------------|------------------------------
-[envs.net](https://envs.net/chat/matrix) | `matrix.envs.net` | https://the-federation.info/node/envs.de | Bots: Poll, Reminder, XKCD and much more
-[Freifunk Südholstein](https://freitrix.de/) | `freitrix.de` | https://the-federation.info/node/freitrix.de | Run by a german Freifunk[^1] community
-[Nitrokey](https://www.nitrokey.com/products/nitrochat) | `nitro.chat` | https://the-federation.info/node/nitro.chat | Run by IT security professionals[^2]
-[sp-codes](https://sp-codes.de/en/services/matrix) | `matrix.sp-codes.de` | https://the-federation.info/node/matrix.sp-codes.de | Run by a security and privacy enthusiast[^3] providing a [german guide](https://sp-codes.de/de/services/matrix/setup/part-1)
-[tchncs.de](https://tchncs.de/matrix) | `tchncs.de` | https://the-federation.info/node/tchncs.de | Bridges: Discord, Signal, Telegram, WhatsApp
+[Nitrokey](https://www.nitrokey.com/products/nitrochat) | `nitro.chat` | None. Receive announcements via Matrix itself or [search the forums](https://support.nitrokey.com/search?q=nitrochat) | Run by IT security professionals[^1]
+[nope.chat](https://adminforge.de/services/matrix-messenger/) | `nope.chat` | https://status.adminforge.de | German admins[^2] offering free services with no tracking, no logging, and no advertising
+[sp-codes](https://sp-codes.de/en/services/matrix) | `matrix.sp-codes.de` | https://status.sp-codes.de | Run by a security and privacy enthusiast[^3] providing a [german guide](https://sp-codes.de/de/services/matrix/setup/part-1)
+[tchncs.de](https://tchncs.de/matrix) | `tchncs.de` | https://status.tchncs.de | Bridges: Signal, Telegram, WhatsApp
 
 Although I'm trying to keep this list up to date, it might be outdated once in
 a while. Therefore, you may check if the homeserver of your choice still
-provides open signups on its status page before registering.
+provides open signups before registering.
+
+{{< callout type="info" >}}
+  If you already registered at the matrix.org homeserver and want to migrate to
+  another provider, [this tool](https://ems.element.io/tools/matrix-migration)
+  is for you. But be aware that it is still in an experimental state!
+{{< /callout >}}
 
 ## More resources
 
@@ -44,6 +49,6 @@ and may take some time to load.
 There's no open registration for my Matrix homeserver, but you can talk to me by 
 joining the matrix room in the [contact](/about/#contact) section.
 
-[^1]: [Freifunk](https://freifunk.net/) community website
-[^2]: [About page of Nitrokey](https://www.nitrokey.com/about)
+[^1]: [About page of Nitrokey](https://www.nitrokey.com/about)
+[^2]: [Giebel.IT](https://www.giebel.it/) business website of the provider
 [^3]: [Personal website](https://samuel-philipp.com/) of the sp-code provider
\ No newline at end of file