diff --git a/homes/x86_64-linux/kb@LANA9Z/default.nix b/homes/x86_64-linux/kb@LANA9Z/default.nix
index 55ccd43..d14df6f 100644
--- a/homes/x86_64-linux/kb@LANA9Z/default.nix
+++ b/homes/x86_64-linux/kb@LANA9Z/default.nix
@@ -71,8 +71,6 @@ in {
 
   services.gpg-agent.enable = true;
 
-  services.ssh-agent.enable = true;
-
   programs.firefox = {
     enable = true;
     nativeMessagingHosts = [ pkgs.firefoxpwa ];
diff --git a/systems/x86_64-linux/LANA9Z/default.nix b/systems/x86_64-linux/LANA9Z/default.nix
index 1a1d4b5..64041f6 100644
--- a/systems/x86_64-linux/LANA9Z/default.nix
+++ b/systems/x86_64-linux/LANA9Z/default.nix
@@ -74,6 +74,9 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
+  # Enable SSH-Agent
+  programs.ssh.startAgent = true;
+
   # Enable sound with pipewire.
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;