diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index a8e11093..0a810c87 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -38,7 +38,7 @@ in {
       "*.nixos.org"
       "nixos.org"
       "matrix.org"
-      "riot.im"
+      "element.io"
       "youtube.de"
       "youtube.com"
     ];
diff --git a/home-manager/roles/chat.nix b/home-manager/roles/chat.nix
index c38b6cae..37da7531 100644
--- a/home-manager/roles/chat.nix
+++ b/home-manager/roles/chat.nix
@@ -2,7 +2,7 @@
 {
   home.packages = builtins.attrValues {
     inherit (pkgs.unfree) discord;
-    inherit (pkgs) signal-desktop tdesktop dino riot-desktop;
+    inherit (pkgs) signal-desktop tdesktop dino element-desktop;
     weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'tmux -L weechat attach'";
   };
 }
diff --git a/nixos/machines/hera/configuration.nix b/nixos/machines/hera/configuration.nix
index 63cc7caa..69456d37 100644
--- a/nixos/machines/hera/configuration.nix
+++ b/nixos/machines/hera/configuration.nix
@@ -15,7 +15,7 @@ in {
     ../../roles/standalone
     ../../roles/server
     ../../roles/git.nix
-    ../../roles/riot.nix
+    ../../roles/element.nix
     ../../roles/mathechor.de.nix
     ../../roles/monitoring
     ../../roles/blog.nix
diff --git a/nixos/roles/riot.nix b/nixos/roles/element.nix
similarity index 79%
rename from nixos/roles/riot.nix
rename to nixos/roles/element.nix
index 520de484..b0d74b30 100644
--- a/nixos/roles/riot.nix
+++ b/nixos/roles/element.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  riot_config = {
+  elementConfig = {
     default_server_config."m.homeserver" = {
       server_name = "maralorn.de";
       base_url = "https://matrix.maralorn.de";
@@ -16,10 +16,10 @@ let
 in {
   services.nginx = {
     enable = true;
-    virtualHosts."riot.maralorn.de" = {
+    virtualHosts."element.maralorn.de" = {
       enableACME = true;
       forceSSL = true;
-      root = pkgs.riot-web.override (old: { conf = riot_config; });
+      root = pkgs.element-web.override (old: { conf = element_config; });
     };
   };
 
diff --git a/nixos/roles/monitoring/probes.nix b/nixos/roles/monitoring/probes.nix
index b4f8408e..2f3e2d75 100644
--- a/nixos/roles/monitoring/probes.nix
+++ b/nixos/roles/monitoring/probes.nix
@@ -46,7 +46,7 @@ in {
         "https://www.mathechor.de"
         "https://cloud.mathechor.de"
         "https://cloud.maralorn.de"
-        "https://riot.maralorn.de"
+        "https://element.maralorn.de"
         "https://wiki.vocalensemble-darmstadt.de"
         "https://cloud.vocalensemble-darmstadt.de"
         "https://www.vocalensemble-darmstadt.de"
diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index 4bbde1e5..a718fe67 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -7,5 +7,5 @@ in {
     inherit (unstable.gnome3) gnome-keyring seahorse gdm;
   };
   inherit (unstable)
-    aqbanking neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb; # riot-desktop;
+    aqbanking neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb element-web element-desktop;
 }