diff --git a/modules/autostart.nix b/modules/autostart.nix
index 98e34d9..cb0da7a 100644
--- a/modules/autostart.nix
+++ b/modules/autostart.nix
@@ -5,14 +5,19 @@
   #   Temporary workaround until https://github.com/nix-community/home-manager/issues/3447 is merged.
 
   home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
-    home.file.signal-desktop = {
-      target = ".config/autostart/" + "signal-desktop" + ".desktop";
-      source = (pkgs.signal-desktop + "/share/applications/" + "signal-desktop" + ".desktop");
+    home.file."keepassxc" = {
+      target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
+      source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");
     };
 
-    home.file.keepassxc = {
-      target = ".config/autostart/" + "org.keepassxc.KeePassXC" + ".desktop";
-      source = (pkgs.keepassxc + "/share/applications/" + "org.keepassxc.KeePassXC" + ".desktop");
+    home.file."signal-desktop" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {
+      target = ".config/autostart/" + pkgs.signal-desktop.pname + ".desktop";
+      source = (pkgs.signal-desktop + "/share/applications/" + pkgs.signal-desktop.pname + ".desktop");
+    };
+
+    home.file."thunderbird" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {
+      target = ".config/autostart/" + pkgs.thunderbird.pname + ".desktop";
+      source = (pkgs.thunderbird + "/share/applications/" + pkgs.thunderbird.pname + ".desktop");
     };
   };
 }