diff --git a/.emacs.d/lisp/main.el b/.emacs.d/lisp/main.el
index 818cf4cc..59d1bafa 100644
--- a/.emacs.d/lisp/main.el
+++ b/.emacs.d/lisp/main.el
@@ -367,5 +367,6 @@
   (setq ws-butler-keep-whitespace-before-point nil))
 
 (setq auth-sources '("~/.authinfo.gpg" "~/.authinfo" "~/.netrc"))
+(add-to-list 'auth-sources 'password-store 'append)
 
 (provide 'main)
diff --git a/.local/bin/homeinit b/.local/bin/homeinit
index cc9ba82a..ddae0ad5 100755
--- a/.local/bin/homeinit
+++ b/.local/bin/homeinit
@@ -331,7 +331,7 @@ if [ -f ~/personal/history/eshell.gpg ]; then
 fi
 
 section "Mail"
-lnn "$SOURCEDIR/mail/authinfo.gpg" "$HOME/.authinfo.gpg"
+# lnn "$SOURCEDIR/mail/authinfo.gpg" "$HOME/.authinfo.gpg" ## Only if no using password-store.
 mkdir -pv "$HOME/.cache/mail/"
 while IFS= read -r i; do
 	## Warning: We need to eval here to expand the "~".
diff --git a/.mbsyncrc b/.mbsyncrc
index e1bdf16a..ffa1cb0e 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -3,7 +3,7 @@
 IMAPAccount mail
 Host mail.gandi.net
 User mail@ambrevar.xyz
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.authinfo.gpg | awk '/login mail@ambrevar.xyz/ {print $(NF); exit}'"
+PassCmd "pass mail@ambrevar.xyz@mail.gandi.net"
 SSLType IMAPS
 
 IMAPStore mail-remote
@@ -35,7 +35,7 @@ SyncState *
 IMAPAccount atlas
 Host mail.gandi.net
 User pierre@atlas.engineer
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.authinfo.gpg | awk '/login pierre@atlas.engineer/ {print $(NF); exit}'"
+PassCmd "pass pierre@atlas.engineer@mail.gandi.net"
 SSLType IMAPS
 
 IMAPStore atlas-remote