diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 85bf8ce..a51805b 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -46,7 +46,7 @@ if [ "$system_type" = "Linux" ]; then
   # Install apt stuff
   sudo apt update -y
   sudo apt upgrade -y
-  sudo apt install -y zsh software-properties-common python-dev python3-dev python3-pip urlview apt-transport-https
+  sudo apt install -y zsh software-properties-common python-dev python3-dev python3-pip urlview apt-transport-https keychain
 
   # Install node if necessary
   if ! command -v node >/dev/null 2>&1; then
diff --git a/.config/zsh/keychain.zsh b/.config/zsh/keychain.zsh
new file mode 120000
index 0000000..b5b4c54
--- /dev/null
+++ b/.config/zsh/keychain.zsh
@@ -0,0 +1 @@
+keychain.zsh##os.WSL
\ No newline at end of file
diff --git a/.config/zsh/keychain.zsh##os.Linux b/.config/zsh/keychain.zsh##os.Linux
new file mode 100644
index 0000000..19c3724
--- /dev/null
+++ b/.config/zsh/keychain.zsh##os.Linux
@@ -0,0 +1,2 @@
+/usr/bin/keychain -q --nogui $HOME/.ssh/id_rsa
+source $HOME/.keychain/$HOST-sh
diff --git a/.config/zsh/keychain.zsh##os.WSL b/.config/zsh/keychain.zsh##os.WSL
new file mode 120000
index 0000000..1746c41
--- /dev/null
+++ b/.config/zsh/keychain.zsh##os.WSL
@@ -0,0 +1 @@
+keychain.zsh##os.Linux
\ No newline at end of file