diff --git a/defaults/main.yml b/defaults/main.yml
index 82cf44a..8290694 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,10 +1,10 @@
 acme_ssl_dir: /etc/ssl
 acme_config_dir: "{{ acme_ssl_dir }}/acme.d"
 acme_config_file: "{{ acme_ssl_dir }}/acme.yml"
-acme_keys_dir: "{{ acme_config_dir }}/private"
-acme_csr_dir: "{{ acme_config_dir }}/csr"
-acme_certs_dir: "{{ acme_config_dir }}/certs"
-acme_accounts_dir: "{{ acme_config_dir }}/accounts"
+acme_keys_dir: "{{ acme_ssl_dir }}/private"
+acme_csr_dir: "{{ acme_ssl_dir }}/csr"
+acme_certs_dir: "{{ acme_ssl_dir }}/certs"
+acme_accounts_dir: "{{ acme_ssl_dir }}/accounts"
 acme_script_dir: /opt/acme
 acme_script_bin: /usr/local/bin/acme-renew-cert
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 2426b42..78422ce 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -63,11 +63,10 @@
     owner: root
     group: root
     mode: "640"
-  loop: "{{ domains }}"
+  loop: "{{ (acme_domains.keys() | list) if acme_domains is mapping else acme_domains }}"
   loop_control:
     label: "{{ domain_name }}"
   vars:
-    domains: (acme_domains.keys() | list) if acme_domains is mapping else acme_domains
     domain_name: "{{ item if item is string else item.name }}"
     domain: "{{ acme_domains[item] if item is string else item }}"
   tags: [acme_install, acme_config]