diff --git a/tasks/main.yml b/tasks/main.yml
index e262adb..1efd80a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -28,7 +28,6 @@
 - name: Install acme.sh
   command: >-
     ./acme.sh --install --log
-    --days {{ acme_sh_renew_time_in_days }}
     {{ "--accountemail " + acme_sh_account_email if acme_sh_account_email else "" }}
   args:
     chdir: "{{ acme_sh_git_clone_dest }}"
@@ -47,7 +46,7 @@
   args:
     chdir: "~/.acme.sh"
   when:
-    - acme_sh_upgrade
+    - acme_sh_upgrade|bool
     - is_acme_sh_installed.stat.exists
     - not acme_sh_uninstall
   register: upgrade_result
@@ -68,7 +67,7 @@
   args:
     chdir: "~/.acme.sh"
   when:
-    - acme_sh_uninstall
+    - acme_sh_uninstall|bool
     - is_acme_sh_installed.stat.exists
   become_user: "{{ acme_sh_become_user }}"
 
@@ -108,7 +107,7 @@
     - item.remove is defined and item.remove
     - not acme_sh_uninstall
 
-- name: Remove acme.sh's cloned source code, installation path and log files
+- name: Remove the acme.sh cloned source code, installation path and log files
   file:
     path: "{{ item }}"
     state: "absent"
@@ -116,7 +115,7 @@
     - "{{ acme_sh_git_clone_dest }}"
     - "~/.acme.sh"
   when:
-    - acme_sh_uninstall
+    - acme_sh_uninstall|bool
   become_user: "{{ acme_sh_become_user }}"
 
 - name: Run custom acme.sh command
@@ -139,6 +138,7 @@
     ./acme.sh --issue -d {{ item.domains | join(" -d ") }}
     --dns {{ item.dns_provider | default(acme_sh_default_dns_provider) }}
     --dnssleep {{ item.dns_sleep | default(acme_sh_default_dns_sleep) }}
+    --days {{ acme_sh_renew_time_in_days }}
     {{ "--force" if item.force_issue | default(acme_sh_default_force_issue) else "" }}
     {{ "--staging" if item.staging | default(acme_sh_default_staging) else "" }}
     {{ "--debug" if item.debug | default(acme_sh_default_debug) else "" }}