diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index e4284a4..9e1c5c1 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -22,6 +22,7 @@
       #../../modules/boxes.nix
       #../../modules/signal-desktop.nix
       #../../modules/element-desktop.nix
+      #../../modules/tor-browser.nix
       #../../modules/autostart.nix
       #../../modules/wallpaper.nix
       #../../modules/fwupd-gnome.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 3a925a7..104ba0a 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -21,6 +21,7 @@
       #../../modules/boxes.nix
       ../../modules/signal-desktop.nix
       ../../modules/element-desktop.nix
+      ../../modules/tor-browser.nix
       ../../modules/autostart.nix
       ../../modules/wallpaper.nix
       ../../modules/fwupd-gnome.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 5557d99..7df2afd 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -21,6 +21,7 @@
       ../../modules/boxes.nix
       ../../modules/signal-desktop.nix
       ../../modules/element-desktop.nix
+      ../../modules/tor-browser.nix
       ../../modules/autostart.nix
       ../../modules/wallpaper.nix
       ../../modules/fwupd-gnome.nix
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index ae220a6..45556e4 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -22,6 +22,7 @@
       #../../modules/boxes.nix
       #../../modules/signal-desktop.nix
       #../../modules/element-desktop.nix
+      #../../modules/tor-browser.nix
       #../../modules/autostart.nix
       #../../modules/wallpaper.nix
       #../../modules/fwupd-gnome.nix
diff --git a/modules/programs.nix b/modules/programs.nix
index 31bbf48..0364f58 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -32,7 +32,6 @@
 
       # Graphical apps
 
-      tor-browser-bundle-bin # Tor web browser
       gnome-secrets # Password manager (Native Wayland client)
       #keepassxc # Password manager
       freetube # YouTube client
diff --git a/modules/tor-browser.nix b/modules/tor-browser.nix
new file mode 100644
index 0000000..634ae37
--- /dev/null
+++ b/modules/tor-browser.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, lib, ... }:
+{
+  users.users.yoda = {
+    packages = with pkgs; [
+      tor-browser-bundle-bin # Tor web browser.
+    ];
+  };
+
+  environment.sessionVariables.MOZ_ENABLE_WAYLAND = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "1";
+}