diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index eef209b..e502da7 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -46,7 +46,7 @@
       ../../modules/nextcloud-client.nix
       ../../modules/syncthing.nix
       ../../modules/signal-desktop.nix
-      #../../modules/element-desktop.nix
+      ../../modules/element-desktop.nix
       ../../modules/obsidian.nix
       ../../modules/vlc-dvd-blu-ray.nix
       ../../modules/firefox.nix
diff --git a/modules/element-desktop.nix b/modules/element-desktop.nix
index a9c62f7..322242b 100644
--- a/modules/element-desktop.nix
+++ b/modules/element-desktop.nix
@@ -1,9 +1,12 @@
 { config, pkgs, lib, ... }:
 {
-  # TODO: Login does not work. Webbrowser does not redirect back to Element app. Firefox does not ask to open link with Element app. It works with the Flatpak version though.
+  # Issue: Login does not work. Webbrowser does not redirect back to Element app. Firefox does not ask to open link with Element app. It works with the Flatpak version though.
   #
-  # NixOS: /home/yoda/.config/Element /home/yoda/.config/Riot
-  # Flatpak: /home/yoda/.var/app/im.riot.Riot/config/Element
+  # Configuration paths with user data:
+  #   NixOS: /home/yoda/.config/Element /home/yoda/.config/Riot
+  #   Flatpak: /home/yoda/.var/app/im.riot.Riot/config/Element
+  #
+  # Solution: Don't use element-desktop-wayland, use the normal element-desktop package instead
   #
   # Workaround:
   # - Login with Flatpak version
@@ -11,17 +14,14 @@
   # - Copy Flatpak into .config/Element
   # - Start the NixOS version, you should be logged in :D
 
-  # TODO: No visible UI on yodaTux (AMD Ryzen 4800H)
-  # Console log:
-  #   ac: Unknown GPU, using 0 for raster_config
-  #   Cannot find target for triple amdgcn-- Unable to find target for this triple (no targets are registered)
-  #
+  # Issue: No visible UI on yodaTux (AMD Ryzen 4800H) when using unstable.element-desktop
   # Workaround: Use Flatpak version ...
+  # Discussion on GitHub: https://github.com/NixOS/nixpkgs/issues/343806 AMD GPUs and NixOS - 'Cannot find target for triple amdgcn-- Unable to find target for this triple (no targets are registered)'
 
   users.users.yoda = {
     packages = with pkgs; [
       # Matrix chat client.
-      unstable.element-desktop
+      element-desktop
     ];
   };
 }