diff --git a/nixos/yubikey.nix b/nixos/yubikey.nix
index 10d18d0..aed66ce 100644
--- a/nixos/yubikey.nix
+++ b/nixos/yubikey.nix
@@ -3,10 +3,7 @@
 {
   services.udev.packages = [ pkgs.yubikey-personalization ];
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
+  programs.ssh.startAgent = true;
 
   # FIXME Don't forget to create an authorization mapping file for your user (https://nixos.wiki/wiki/Yubikey#pam_u2f)
   security.pam.u2f = {