diff --git a/systems/common.nix b/systems/common.nix
index 49f661e..564c0c6 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -12,6 +12,8 @@
   ];
 
   programs = {
+    ssh.startAgent = true;
+
     fish = {
       enable = true;
       interactiveShellInit = ''
diff --git a/systems/desktop.nix b/systems/desktop.nix
index a0e3d6c..58f40d9 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -151,7 +151,6 @@ in {
     services = {
       gpg-agent = {
         enable = true;
-        enableSshSupport = true;
         pinentryFlavor = "gnome3";
       };
     };
@@ -160,7 +159,6 @@ in {
   programs = {
     gnupg.agent = {
       enable = true;
-      enableSSHSupport = true;
       pinentryFlavor = "gnome3";
     };