diff --git a/group_vars/certbot.yml b/group_vars/certbot.yml
index 2ec065c3e96303a2184830a6309fcdf63222adbe..5c414fbe2b31fbae6a20fdd17b4ce840857393f9 100644
--- a/group_vars/certbot.yml
+++ b/group_vars/certbot.yml
@@ -19,5 +19,5 @@ glob_service_certbot:
       port: 53
       key:
         name: certbot_challenge.
-        secret: "{{ vault.certbot_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_challenge.'].secret }}"
         algorithm: HMAC-SHA512
diff --git a/group_vars/reverseproxy.yml b/group_vars/reverseproxy.yml
index 1d358aa1c62032eca3a01de6334f088a09dc9e8b..fc4dc511cd50481f284f9654599f3e3fd9732ee2 100644
--- a/group_vars/reverseproxy.yml
+++ b/group_vars/reverseproxy.yml
@@ -12,7 +12,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_challenge.
-        secret: "{{ vault.certbot_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_challenge.'].secret }}"
         algorithm: HMAC-SHA512
     "crans.eu":
       zone: _acme-challenge.crans.org
@@ -20,7 +20,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_challenge.
-        secret: "{{ vault.certbot_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_challenge.'].secret }}"
         algorithm: HMAC-SHA512
     "crans.fr":
       zone: _acme-challenge.crans.org
@@ -28,7 +28,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_challenge.
-        secret: "{{ vault.certbot_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_challenge.'].secret }}"
         algorithm: HMAC-SHA512
 
 loc_nginx:
diff --git a/host_vars/gitzly.adm.crans.org.yml b/host_vars/gitzly.adm.crans.org.yml
index b7a62d71e225d5f1a6e1cfe4e8d88af268a3d7cf..13b0558d64fbd4bd86e8b74d9ba29bde3b787e57 100644
--- a/host_vars/gitzly.adm.crans.org.yml
+++ b/host_vars/gitzly.adm.crans.org.yml
@@ -19,7 +19,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_challenge.
-        secret: "{{ vault.certbot_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_challenge.'].secret }}"
         algorithm: HMAC-SHA512
     "adm.crans.org":
       zone: _acme-challenge.adm.crans.org
@@ -27,7 +27,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_adm_challenge.
-        secret: "{{ vault.certbot_adm_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_adm_challenge.'].secret }}"
         algorithm: HMAC-SHA512
 
 loc_nginx:
diff --git a/host_vars/redisdead.adm.crans.org.yml b/host_vars/redisdead.adm.crans.org.yml
index ffb8ec0407e5ed335f80f83d04adb2b0b718c0e5..9bd797c4f6cdbe0019630c8de093f5316237b2c3 100644
--- a/host_vars/redisdead.adm.crans.org.yml
+++ b/host_vars/redisdead.adm.crans.org.yml
@@ -23,7 +23,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_challenge.
-        secret: "{{ vault.certbot_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_challenge.'].secret }}"
         algorithm: HMAC-SHA512
     "adm.crans.org":
       zone: _acme-challenge.adm.crans.org
@@ -31,5 +31,5 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_adm_challenge.
-        secret: "{{ vault.certbot_adm_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_adm_challenge.'].secret }}"
         algorithm: HMAC-SHA512
diff --git a/host_vars/sputnik.adm.crans.org.yml b/host_vars/sputnik.adm.crans.org.yml
index 4214b05474f2c522b187836a00ba3a9f7da5832a..c8e7983bcf709b4849d5853eaacd87e5ce6063e6 100644
--- a/host_vars/sputnik.adm.crans.org.yml
+++ b/host_vars/sputnik.adm.crans.org.yml
@@ -48,7 +48,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_challenge.
-        secret: "{{ vault.certbot_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_challenge.'].secret }}"
         algorithm: HMAC-SHA512
     "adm.crans.org":
       zone: _acme-challenge.adm.crans.org
@@ -56,7 +56,7 @@ loc_service_certbot:
       port: 53
       key:
         name: certbot_adm_challenge.
-        secret: "{{ vault.certbot_adm_dns_secret }}"
+        secret: "{{ vault.bind.keys['certbot_adm_challenge.'].secret }}"
         algorithm: HMAC-SHA512
 
 loc_nginx: