diff --git a/.zshrc b/.zshrc
index 40a7d3f..5e822ec 100644
--- a/.zshrc
+++ b/.zshrc
@@ -106,12 +106,9 @@ if command -v zoxide > /dev/null ; then
 fi
 
 if [[ "$(uname -r)" =~ "microsoft" ]] ; then
-  if [ -z "$(pgrep ssh-agent)" ]; then
-     rm -rf /tmp/ssh-*
-     eval $(ssh-agent -s) > /dev/null
-  else
-     export SSH_AGENT_PID=$(pgrep ssh-agent)
-     export SSH_AUTH_SOCK=$(find /tmp/ssh-* -name "agent.*")
+  if command -v keychain > /dev/null ; then
+    keychain -q --nogui "$HOME/.ssh/id_ed25519"
+    source "$HOME/.keychain/$(hostname)-sh"
   fi
 fi