diff --git a/.zshrc b/.zshrc
index 1a40acb..0d299cc 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,6 +5,8 @@ setopt HIST_IGNORE_SPACE
 setopt HIST_FIND_NO_DUPS
 setopt HIST_SAVE_NO_DUPS
 
+zstyle :omz:plugins:keychain agents gpg,ssh
+zstyle :omz:plugins:keychain options --quiet
 zstyle :omz:plugins:ssh-agent agent-forwarding yes
 zstyle :omz:plugins:ssh-agent lazy yes
 zstyle :omz:plugins:ssh-agent lifetime 8h
@@ -18,9 +20,11 @@ tmux
 command-not-found
 debian
 direnv
+git
+git-extras
 gpg-agent
+keychain
 pip
-ssh-agent
 common-aliases
 MichaelAquilina/zsh-you-should-use
 svenXY/timewarrior