diff --git a/home-manager/common/software/cli/bash.nix b/home-manager/common/software/cli/bash.nix
index 54df6a63..ab191bfb 100644
--- a/home-manager/common/software/cli/bash.nix
+++ b/home-manager/common/software/cli/bash.nix
@@ -34,6 +34,7 @@
       enableCompletion = true;
       initExtra = ''
         GPG_TTY=$(tty)
+        ssh-add
       '';
       sessionVariables = {
         # Set the GTK Theme
diff --git a/nixos/common/services/openssh.nix b/nixos/common/services/openssh.nix
index 50561da4..a17d5e5d 100644
--- a/nixos/common/services/openssh.nix
+++ b/nixos/common/services/openssh.nix
@@ -3,7 +3,6 @@
   # Useful for deploy-rs
   security.pam.enableSSHAgentAuth = true;
   programs.ssh.startAgent = true;
-  programs.ssh.agentTimeout = "1h";
   # By default no ports are open.
   # When ./tailscale.nix is imported, port 22 on the tailscale interface is then opened.
   services.openssh = {