diff --git a/group_vars/mailman.yml b/group_vars/mailman.yml
index e65ec8ee6e4ef7d9ce44b7ab7a6671c878dc1bf9..871b1da0366cd125a9c3ebcdaebbb9bd8c55ee41 100644
--- a/group_vars/mailman.yml
+++ b/group_vars/mailman.yml
@@ -56,19 +56,19 @@ glob_mailman3:
   site_owner: root@crans.org
   database:
     user: "mailman3"
-    pass: "{{ vault.mailman3_database_pass }}"
+    pass: "{{ vault.mailman3.database.pass }}"
     host: "{{ query('ldap', 'ip', 'tealc', 'adm') | ipv4 | first }}"
     port: 5432
     name: "mailman3"
   web_database:
     user: "mailman3web"
-    pass: "{{ vault.mailman3_web_database_pass }}"
+    pass: "{{ vault.mailman3.web_database.pass }}"
     host: "{{ query('ldap', 'ip', 'tealc', 'adm') | ipv4 | first }}"
     port: 5432
     name: "mailman3web"
-  restadmin_pass: "{{ vault.mailman3_restadmin_pass }}"
-  archiver_key: "{{ vault.mailman3_archiver_key }}"
-  web_secret_key: "{{ vault.mailman3_web_secret_key }}"
+  restadmin_pass: "{{ vault.mailman3.restadmin_pass }}"
+  archiver_key: "{{ vault.mailman3.archiver_key }}"
+  web_secret_key: "{{ vault.mailman3.web_secret_key }}"
   web_domains:
     - "lists.crans.org"
   default_domain: "lists.crans.org"