diff --git a/evoacme/tasks/apache.yml b/evoacme/tasks/apache.yml
index 532545ae..cc22f234 100644
--- a/evoacme/tasks/apache.yml
+++ b/evoacme/tasks/apache.yml
@@ -5,7 +5,6 @@
     owner: root
     group: root
     mode: 0644
-  validate: apache2ctl -t
   notify: reload apache2
 
 - name: Enable acme challenge conf
@@ -15,5 +14,4 @@
     state: link
     owner: root
     group: root
-  validate: apache2ctl -t
   notify: reload apache2
diff --git a/evoacme/tasks/certbot.yml b/evoacme/tasks/certbot.yml
index 7ab98be5..5ed224e8 100644
--- a/evoacme/tasks/certbot.yml
+++ b/evoacme/tasks/certbot.yml
@@ -40,7 +40,7 @@
     file:
       path: /usr/local/bin/certbot
       state: absent
-  when: release is defined
+  when: evoacme_certbot_release is defined
 
 - block:
   - name: Install certbot from source
@@ -70,7 +70,7 @@
       dest: /etc/sudoers.d/certbot
       mode: 0440
       validate: '/usr/sbin/visudo -cf %s'
-  when: release is undefined
+  when: evoacme_certbot_release is undefined
 
 - name: Remove certbot dpkg cron
   file:
diff --git a/evoacme/tasks/conf.yml b/evoacme/tasks/conf.yml
index e7ef336d..e9bc0c15 100644
--- a/evoacme/tasks/conf.yml
+++ b/evoacme/tasks/conf.yml
@@ -12,7 +12,7 @@
 
 - name: Update openssl conf
   ini_file:
-    dest: "{{ crt_dir }}/openssl.cnf"
+    dest: "{{ evoacme_crt_dir }}/openssl.cnf"
     section: 'req_dn'
     option: "{{ item.name }}"
     value: "{{ item.var }}"