diff --git a/conf.d/imapnotify/games@mala.fr.conf b/conf.d/imapnotify/games@mala.fr.conf
index a6ff245..0400c0b 100644
--- a/conf.d/imapnotify/games@mala.fr.conf
+++ b/conf.d/imapnotify/games@mala.fr.conf
@@ -7,7 +7,7 @@
   },
   "username": "games@mala.fr",
   "password": "",
-  "passwordCmd": "secret-tool lookup email games@mala.fr service imap",
+  "passwordCmd": "pass ssl0.ovh.net/games@mala.fr",
   "onNewMail": "mbsync games@mala.fr-inbox",
   "onNewMailPost": "notmuch new",
   "boxes": [
diff --git a/conf.d/imapnotify/jean-francois.lance@ac-creteil.fr.conf b/conf.d/imapnotify/jean-francois.lance@ac-creteil.fr.conf
index c0833c6..effb256 100644
--- a/conf.d/imapnotify/jean-francois.lance@ac-creteil.fr.conf
+++ b/conf.d/imapnotify/jean-francois.lance@ac-creteil.fr.conf
@@ -7,7 +7,7 @@
   },
   "username": "jlance",
   "password": "",
-  "passwordCmd": "secret-tool lookup email jean-francois.lance@ac-creteil.fr service imap",
+  "passwordCmd": "pass ac-creteil.fr/jlance",
   "onNewMail": "mbsync jean-francois.lance@ac-creteil.fr-inbox",
   "onNewMailPost": "notmuch new",
   "boxes": [
diff --git a/conf.d/imapnotify/jeff.lance@mala.fr.conf b/conf.d/imapnotify/jeff.lance@mala.fr.conf
index d546c7a..f519ad3 100644
--- a/conf.d/imapnotify/jeff.lance@mala.fr.conf
+++ b/conf.d/imapnotify/jeff.lance@mala.fr.conf
@@ -7,7 +7,7 @@
   },
   "username": "jeff.lance@mala.fr",
   "password": "",
-  "passwordCmd": "secret-tool lookup email jeff.lance@mala.fr service imap",
+  "passwordCmd": "pass ssl0.ovh.net/jeff.lance@mala.fr",
   "onNewMail": "~/bin/emails/mailsync jeff.lance@mala.fr-inbox",
   "onNewMailPost": "notmuch new",
   "boxes": [
diff --git a/conf/mbsyncrc b/conf/mbsyncrc
index a9d8297..683842f 100644
--- a/conf/mbsyncrc
+++ b/conf/mbsyncrc
@@ -30,8 +30,8 @@ Host ssl0.ovh.net
 User jeff.lance@mala.fr
 # Get the password account through secret-tool
 # I replaced it by a pass command
-PassCmd "secret-tool lookup email jeff.lance@mala.fr service imap"
-# PassCmd "pass emails/jeff.lance@mala.fr"
+# PassCmd "secret-tool lookup email jeff.lance@mala.fr service imap"
+PassCmd "pass ssl0.ovh.net/jeff.lance@mala.fr"
 # Use SSL
 # SSLType IMAPS
 SSLType None
@@ -122,8 +122,8 @@ Host ssl0.ovh.net
 User games@mala.fr
 # Get the password account through secret-tool
 # I replaced it by a pass command
-PassCmd "secret-tool lookup email games@mala.fr service imap"
-# PassCmd "pass emails/games@mala.fr"
+# PassCmd "secret-tool lookup email games@mala.fr service imap"
+PassCmd "pass ssl0.ovh.net/games@mala.fr"
 # Use SSL
 # SSLType IMAPS
 SSLType None
@@ -201,8 +201,8 @@ Host imap.ac-creteil.fr
 User jlance
 # Get the password account through secret-tool
 # I replaced it by a pass command
-PassCmd "secret-tool lookup email jean-francois.lance@ac-creteil.fr service imap"
-# PassCmd "pass emails/jean-francois.lance@ac-creteil.fr"
+# PassCmd "secret-tool lookup email jean-francois.lance@ac-creteil.fr service imap"
+PassCmd "pass ac-creteil.fr/jlance"
 # Use SSL
 SSLType IMAPS
 # The following line should work.
diff --git a/conf/msmtprc b/conf/msmtprc
index fd0a235..3f1d330 100644
--- a/conf/msmtprc
+++ b/conf/msmtprc
@@ -13,7 +13,7 @@ auth		      on
 tls           on
 tls_starttls	off
 user		      jeff.lance@mala.fr
-passwordeval  "echo $(secret-tool lookup service smtp user jeff.lance@mala.fr)"
+passwordeval  "echo $(pass ssl0.ovh.net/jeff.lance@mala.fr)"
 auto_from	    off
 from		      jeff.lance@mala.fr
 
@@ -24,7 +24,7 @@ auth		      on
 tls           on
 tls_starttls	off
 user		      games@mala.fr
-passwordeval  "echo $(secret-tool lookup service smtp user games@mala.fr)"
+passwordeval  "echo $(pass ssl0.ovh.net/games@mala.fr)"
 auto_from	    off
 from		      games@mala.fr
 
@@ -36,7 +36,7 @@ auth		      on
 tls		        on
 tls_starttls	off
 user		      mathslance@gmail.com
-passwordeval  "echo $(secret-tool lookup service smtp user mathslance@gmail.com)"
+passwordeval  "echo $(pass google.com/mathslance@gmail.com)"
 auto_from	    off
 from		      mathslance@gmail.com
 
@@ -48,7 +48,7 @@ auth		      plain
 tls		        on
 tls_starttls	off
 user		      jlance
-passwordeval  "echo $(secret-tool lookup service smtp user jlance)"
+passwordeval  "echo $(pass ac-creteil.fr/jlance)"
 auto_from	    off
 from		      jean-francois.lance@ac-creteil.fr