diff --git a/home/felschr-work.nix b/home/felschr-work.nix
index be24538..6029a07 100644
--- a/home/felschr-work.nix
+++ b/home/felschr-work.nix
@@ -28,9 +28,10 @@ with pkgs;
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
-    extraConfig = ''
-      pinentry-program ${pkgs.pinentry-gnome}/bin/pinentry-gnome3
-    '';
+    sshKeys = [ "967EC4516D18D0E1211FCFC38B1CAF89FF627FCA" ];
+    defaultCacheTtl = 600;
+    defaultCacheTtlSsh = 600;
+    pinentryFlavor = "gnome3";
   };
 
   programs.gpg.enable = true;
diff --git a/home/felschr.nix b/home/felschr.nix
index 5fd2c8a..3f7d277 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -32,9 +32,10 @@
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
-    extraConfig = ''
-      pinentry-program ${pkgs.pinentry-gnome}/bin/pinentry-gnome3
-    '';
+    sshKeys = [ "4AE1DDE05F4BB6C8E220501F1336A98E89836D90" ];
+    defaultCacheTtl = 600;
+    defaultCacheTtlSsh = 600;
+    pinentryFlavor = "gnome3";
   };
 
   programs.gpg.enable = true;