diff --git a/defaults/main.yml b/defaults/main.yml
index c76d169..ff5e70b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
+certbot_initial_run_enabled: False
 certbot_work_dir: /var/lib/letsencrypt
 certbot_config_dir: /etc/letsencrypt
 certbot_log_dir: /var/log/letsencrypt
diff --git a/tasks/init.yml b/tasks/init.yml
new file mode 100644
index 0000000..6cbe938
--- /dev/null
+++ b/tasks/init.yml
@@ -0,0 +1,13 @@
+---
+- name: Initialise certbot
+  block:
+    - name: Initial run of certbot
+      shell: >
+        certbot
+        --config-dir {{ certbot_config_dir }}
+        --work-dir {{ certbot_work_dir }}
+        --logs-dir {{ certbot_log_dir }}
+        {{ certbot_command_arguments | join(' ') }}
+  become: True
+  become_user: "{{ certbot_user }}"
+  when: certbot_initial_run_enabled
diff --git a/tasks/install.yml b/tasks/install.yml
index e2443b5..127144b 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -34,11 +34,11 @@
         hour: 3
         user: "{{ certbot_user }}"
         job: >
-          "certbot
+          certbot
           --config-dir {{ certbot_config_dir }}
           --work-dir {{ certbot_work_dir }}
           --logs-dir {{ certbot_log_dir }}
-          {{ certbot_command_arguments | join(' ') }}"
+          {{ certbot_command_arguments | join(' ') }}
         cron_file: "{{ certbot_cronfile | default(omit) }}"
       when: certbot_scheduler_enabled
   become: True