diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 533427a..d741d71 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -5,7 +5,7 @@ set -x EDITOR vim
 set -x VIRTUAL_ENV_DISABLE_PROMPT true
 
 ## SSH init
-set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
+set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
 for f in (ls $HOME/.ssh/*.pub);
   set -l priv (string replace '.pub' '' $f);
   if not contains $priv (ssh-add -l | awk '{ print $3 }')
diff --git a/systemd/.config/systemd/user/default.target.wants/gnome-keyring-daemon.service b/systemd/.config/systemd/user/default.target.wants/gnome-keyring-daemon.service
new file mode 120000
index 0000000..bbc16ef
--- /dev/null
+++ b/systemd/.config/systemd/user/default.target.wants/gnome-keyring-daemon.service
@@ -0,0 +1 @@
+/home/bca/.config/systemd/user/gnome-keyring-daemon.service
\ No newline at end of file
diff --git a/systemd/.config/systemd/user/default.target.wants/ssh-agent.service b/systemd/.config/systemd/user/default.target.wants/ssh-agent.service
deleted file mode 120000
index 609ba84..0000000
--- a/systemd/.config/systemd/user/default.target.wants/ssh-agent.service
+++ /dev/null
@@ -1 +0,0 @@
-/home/bca/.config/systemd/user/ssh-agent.service
\ No newline at end of file
diff --git a/systemd/.config/systemd/user/gnome-keyring-daemon.service b/systemd/.config/systemd/user/gnome-keyring-daemon.service
index 1b312bb..a61a645 100644
--- a/systemd/.config/systemd/user/gnome-keyring-daemon.service
+++ b/systemd/.config/systemd/user/gnome-keyring-daemon.service
@@ -3,7 +3,7 @@ Description=Gnome Keyring daemon
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,gnupg
+ExecStart=/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets
 
 [Install]
 WantedBy=default.target