diff --git a/modules/desktop/gnome-keyring.nix b/modules/desktop/gnome-keyring.nix
index 7ae4ab6..8913d2a 100644
--- a/modules/desktop/gnome-keyring.nix
+++ b/modules/desktop/gnome-keyring.nix
@@ -9,6 +9,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    services.gnome.gnome-keyring.enable = true;
+    hm.services.gnome-keyring.enable = true;
+    hm.services.gnome-keyring.components = [ "secrets" ];
   };
 }
diff --git a/modules/software/tools/gpg.nix b/modules/software/tools/gpg.nix
index 2761cba..a36baaf 100644
--- a/modules/software/tools/gpg.nix
+++ b/modules/software/tools/gpg.nix
@@ -12,6 +12,8 @@ in {
     hm.programs.gpg.enable = true;
     hm.services.gpg-agent = {
       enable = true;
+      enableExtraSocket = true;
+      enableSshSupport = true;
 
       pinentryPackage = pkgs.pinentry-gnome3;
     };