diff --git a/roles/dehydrated-domains/templates/hook.sh.j2 b/roles/dehydrated-domains/templates/hook.sh.j2
index 28e7fee..5baa6a7 100644
--- a/roles/dehydrated-domains/templates/hook.sh.j2
+++ b/roles/dehydrated-domains/templates/hook.sh.j2
@@ -22,7 +22,7 @@ deploy_challenge() {
 
     # Simple example: Use nsupdate with local named
     # printf 'server 127.0.0.1\nupdate add _acme-challenge.%s 300 IN TXT "%s"\nsend\n' "${DOMAIN}" "${TOKEN_VALUE}" | nsupdate -k /var/run/named/session.key
-    {{ dehydrated_deploy_challenge_hook }}
+    {{ item.deploy_challenge_hook }}
 }
 
 clean_challenge() {
@@ -36,7 +36,7 @@ clean_challenge() {
 
     # Simple example: Use nsupdate with local named
     # printf 'server 127.0.0.1\nupdate delete _acme-challenge.%s TXT "%s"\nsend\n' "${DOMAIN}" "${TOKEN_VALUE}" | nsupdate -k /var/run/named/session.key
-    {{ dehydrated_clean_challenge_hook }}
+    {{ item.clean_challenge_hook }}
 }
 
 sync_cert() {
@@ -63,7 +63,7 @@ sync_cert() {
 
     # Simple example: sync the files before symlinking them
     # sync "${KEYFILE}" "${CERTFILE}" "${FULLCHAINFILE}" "${CHAINFILE}" "${REQUESTFILE}"
-    {{ dehydrated_sync_cert_hook }}
+    {{ item.sync_cert_hook }}
 }
 
 deploy_cert() {
@@ -91,7 +91,7 @@ deploy_cert() {
     # Simple example: Copy file to nginx config
     # cp "${KEYFILE}" "${FULLCHAINFILE}" /etc/nginx/ssl/; chown -R nginx: /etc/nginx/ssl
     # systemctl reload nginx
-    {{ dehydrated_deploy_cert_hook }}
+    {{ item.deploy_cert_hook }}
 }
 
 deploy_ocsp() {
@@ -113,7 +113,7 @@ deploy_ocsp() {
     # Simple example: Copy file to nginx config
     # cp "${OCSPFILE}" /etc/nginx/ssl/; chown -R nginx: /etc/nginx/ssl
     # systemctl reload nginx
-    {{ dehydrated_deploy_ocsp_hook }}
+    {{ item.deploy_ocsp_hook }}
 }
 
 
@@ -135,7 +135,7 @@ unchanged_cert() {
     #   The path of the file containing the full certificate chain.
     # - CHAINFILE
     #   The path of the file containing the intermediate certificate(s).
-    {{ dehydrated_unchanged_cert_hook }}
+    {{ item.unchanged_cert_hook }}
 }
 
 invalid_challenge() {
@@ -153,7 +153,7 @@ invalid_challenge() {
 
     # Simple example: Send mail to root
     # printf "Subject: Validation of ${DOMAIN} failed!\n\nOh noez!" | sendmail root
-    {{ dehydrated_invalid_challenge_hook }}
+    {{ item.invalid_challenge_hook }}
 }
 
 request_failure() {
@@ -176,7 +176,7 @@ request_failure() {
 
     # Simple example: Send mail to root
     # printf "Subject: HTTP request failed failed!\n\nA http request failed with status ${STATUSCODE}!" | sendmail root
-    {{ dehydrated_request_failure_hook }}
+    {{ item.request_failure_hook }}
 }
 
 generate_csr() {
@@ -202,14 +202,14 @@ generate_csr() {
     # if [ -e "${CERTDIR}/pre-generated.csr" ]; then
     #   cat "${CERTDIR}/pre-generated.csr"
     # fi
-    {{ dehydrated_startup_hook }}
+    {{ item.startup_hook }}
 
 }
 
 startup_hook() {
   # This hook is called before the cron command to do some initial tasks
   # (e.g. starting a webserver).
-  {{ dehydrated_startup_hook }}
+  {{ item.startup_hook }}
   :
 }
 
@@ -221,7 +221,7 @@ exit_hook() {
   # Parameters:
   # - ERROR
   #   Contains error message if dehydrated exits with error
-  {{ dehydrated_exit_hook }}
+  {{ item.exit_hook }}
 }
 
 HANDLER="$1"; shift