diff --git a/users/jordan/common/gpg.nix b/users/jordan/common/gpg.nix
index a234303..885929f 100644
--- a/users/jordan/common/gpg.nix
+++ b/users/jordan/common/gpg.nix
@@ -9,7 +9,6 @@
 
   services.gpg-agent = {
     enable = true;
-    enableSshSupport = true;
   };
 
   home.persistence."/persist".directories = [
diff --git a/users/jordan/common/ssh.nix b/users/jordan/common/ssh.nix
index c745156..6862ac5 100644
--- a/users/jordan/common/ssh.nix
+++ b/users/jordan/common/ssh.nix
@@ -3,11 +3,8 @@
 }:
 
 {
-  services.ssh-agent.enable = true;
-
   programs.ssh = {
     enable = true;
-    matchBlocks."*".addKeysToAgent = "yes";
   };
 
   home.persistence."/state".files = [