diff --git a/.bashrc b/.bashrc
index 218417c..9598473 100644
--- a/.bashrc
+++ b/.bashrc
@@ -136,7 +136,10 @@ echo '**************************************************'|lolcat
 cowsay -f tux "Welcome Dr. The system is ready to accept your commands.  Have a nice day" | lolcat
 echo '**************************************************'|lolcat
 echo ''
-eval $(ssh-agent -s)
+
+# Set up ssh-agent using keychain
+/usr/bin/keychain --nogui $HOME/.ssh/id_rsa
+source $HOME/.keychain/$HOSTNAME-sh
 
 # Run fish
-fish
+# fish
diff --git a/config.fish b/config.fish
index 78f1e84..2e67cd2 100644
--- a/config.fish
+++ b/config.fish
@@ -6,8 +6,6 @@
 # *
 # ***************************************************************************
 
-# load ssh-agent
-eval (ssh-agent -c)
 
 set PATH ~/.local/bin $PATH
 # go to my wsl home folder