diff --git a/defaults/main.yml b/defaults/main.yml
index 2a116b8..6cb2cec 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -24,11 +24,12 @@ certbot_certs: []
 #     - example3.com
 
 certbot_create_command: >-
-  {{ certbot_script }} certonly --standalone --noninteractive --agree-tos
-  --{{ certbot_create_method  }} {{ `-w ` if certbot_create_method == 'webroot'  else '' }}
+  {{ certbot_script }} certonly --{{ certbot_create_method  }}
+  {{ `-w ` if certbot_create_method == 'webroot'  else '' }}
   {{ cert_item.webroot if certbot_create_method == 'webroot'  else '' }}
   {{ '--hsts' if certbot_hsts else '' }}
   {{ '--test-cert' if certbot_testmode else '' }}
+  --noninteractive --agree-tos
   --email {{ cert_item.email | default(certbot_admin_email) }}
   -d {{ cert_item.domains | join(',') }}
   {{ '--pre-hook /etc/letsencrypt/renewal-hooks/pre/stop_services'
@@ -55,4 +56,4 @@ certbot_keep_updated: true
 certbot_dir: /opt/certbot
 
 # Restart this service after successfull certificate creation:
-certbot_deployhook: "service {{certbot_create_standalone_stop_services }} restart"
\ No newline at end of file
+certbot_deployhook: "service {{certbot_create_standalone_stop_services }} restart"
diff --git a/tasks/create-cert-webroot.yml b/tasks/create-cert-webroot.yml
index fd43f41..71509b5 100644
--- a/tasks/create-cert-webroot.yml
+++ b/tasks/create-cert-webroot.yml
@@ -9,10 +9,9 @@
     content: "{{ certbot_deployhook }}"
     dest: /etc/letsencrypt/renewal-hooks/deploy/ansible.sh
     mode: u+rwx
-  run_once: yes
+  run_once: true
   when: certbot_deployhook is defined
 
 - name: Generate new certificate if one doesn't exist.
   shell: "{{ certbot_create_command }}"
   when: not letsencrypt_cert.stat.exists
-