diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index 2be9f493..23c4e4d8 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -66,6 +66,13 @@
         ];
       };
   };
+  xdg.configFile = {
+    # Autostart some programs
+    "autostart/signal-desktop.desktop".source =
+      "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
+    "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source =
+      "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+  };
   boot = {
     kernel.sysctl = {
       "vm.max_map_count" = 16777216;
diff --git a/system/desktop.nix b/system/desktop.nix
index df14589f..9d171e02 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -239,11 +239,6 @@
               spellCheckerLanguages = [ "en_GB" ];
             };
           };
-          # Autostart some programs
-          "autostart/signal-desktop.desktop".source =
-            "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
-          "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source =
-            "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
         };
       };
     };