diff --git a/tasks/create-cert-standalone.yml b/tasks/create-cert-standalone.yml
index 1347dd9..4640aaf 100644
--- a/tasks/create-cert-standalone.yml
+++ b/tasks/create-cert-standalone.yml
@@ -13,6 +13,7 @@
   shell: "{{ certbot_create_command }}"
   when: not letsencrypt_cert_exists.stat.exists or letsencrypt_cert_updated
 
+# TODO May use a more direct https://docs.ansible.com/ansible/latest/copy_module.html
 - name: Persist domain list to host
   lineinfile:
     path: /etc/letsencrypt/domains-{{ cert_item.domains | first }}
diff --git a/tasks/test-cert-exists.yml b/tasks/test-cert-exists.yml
index 02553af..d3f4f30 100644
--- a/tasks/test-cert-exists.yml
+++ b/tasks/test-cert-exists.yml
@@ -4,21 +4,16 @@
     path: /etc/letsencrypt/live/{{ cert_item.domains | first }}/cert.pem
   register: letsencrypt_cert_exists
 
-- name: Check if certificate domain list exists.
-  stat:
-    path: /etc/letsencrypt/domains-{{ cert_item.domains | first }}
-  register: letsencrypt_cert_list_exists
-  when: letsencrypt_cert_exists.stat.exists
-
 - name: Check if certificate domain list has changed.
   lineinfile:
     path: /etc/letsencrypt/domains-{{ cert_item.domains | first }}
     line: "{{ cert_item.domains }}"
     state: present
+    create: yes
   check_mode: yes
   register: letsencrypt_cert_contents
-  when: letsencrypt_cert_exists.stat.exists and letsencrypt_cert_list_exists.stat.exists
+  when: letsencrypt_cert_exists.stat.exists
 
 - set_fact:
-    letsencrypt_cert_updated: "{{ not letsencrypt_cert_list_exists.stat.exists or (letsencrypt_cert_contents | changed) or (letsencrypt_cert_contents | failed) }}"
+    letsencrypt_cert_updated: "{{ (letsencrypt_cert_contents | changed) or (letsencrypt_cert_contents | failed) }}"
   when: letsencrypt_cert_exists.stat.exists