diff --git a/shell/keychain.sh b/shell/keychain.sh
index 6ee2300..30e836c 100755
--- a/shell/keychain.sh
+++ b/shell/keychain.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
 # array to process, either folders or directories for recursive processing
-KEYPATHS+=("$HOME/.ssh/keys" "$HOME/.ssh/gitlab_rsa" "$HOME/.ssh/id_rsa")
+KEYPATHS+=("$HOME/.ssh")
 
 if command -v keychain 2>&1 >/dev/null; then
 	eval \
-		`find ${KEYPATHS[@]} -type f -not -name '*.pub' 2>/dev/null \
-		| xargs keychain -q --nogui --agents ssh --timeout 600 --eval`
+        "$(find "${KEYPATHS[@]}" -type f -name '*.pub' 2>/dev/null \
+		| sed 's/.pub$//' \
+        | xargs keychain -q --nogui --agents ssh --timeout 600 --eval)"
 fi
 unset KEYPATHS