diff --git a/tasks/create-cert-standalone.yml b/tasks/create-cert-standalone.yml
index 6c7f501..2fa8664 100644
--- a/tasks/create-cert-standalone.yml
+++ b/tasks/create-cert-standalone.yml
@@ -15,10 +15,10 @@
 
 - name: Persist domain list to /etc/letsencrypt/domains-{{ cert_item.domains | first }}.
   copy:
-    dest: /etc/letsencrypt/domains-{{ cert_item.domains | first }}
+    dest: /etc/letsencrypt/domains-{{ cert_item.domains | first }}.json
     # Add a space here because of https://github.com/ansible/ansible/issues/6077
-    content: " {{ cert_item.domains }}\n"
-  # when: not letsencrypt_cert_exists.stat.exists or letsencrypt_cert_updated
+    content: " {{ cert_item.domains | to_json }}\n"
+  when: not letsencrypt_cert_exists.stat.exists or letsencrypt_cert_updated
 
 - name: Start services after cert has been generated.
   service:
diff --git a/tasks/test-cert-exists.yml b/tasks/test-cert-exists.yml
index 4b571d6..7090c02 100644
--- a/tasks/test-cert-exists.yml
+++ b/tasks/test-cert-exists.yml
@@ -6,8 +6,8 @@
 
 - name: Check if certificate domain list has changed.
   lineinfile:
-    path: /etc/letsencrypt/domains-{{ cert_item.domains | first }}
-    line: " {{ cert_item.domains }}"
+    path: /etc/letsencrypt/domains-{{ cert_item.domains | first }}.json
+    line: " {{ cert_item.domains | to_json }}"
     state: present
     create: yes
   check_mode: yes