diff --git a/dkim/defaults/main.yml b/dkim/defaults/main.yml
index 518de5e91aad96b86fdbc281f30175b58e4b5843..418ebcce9b82f008b943c7cf2166e10b91548a67 100644
--- a/dkim/defaults/main.yml
+++ b/dkim/defaults/main.yml
@@ -13,7 +13,7 @@ dkim_query_cache: "yes"
 dkim_remove_old_signatures: "no"  # TODO: evaluate for RWTH Servers
 dkim_report_address: "{{ dovecot_admin_mail }}"
 dkim_send_reports: "no"  # TODO: evaluate after test phase
-dkim_software_headers: "yes" 
+dkim_software_headers: "yes"
 
 dkim_signature_ttl: 0
 
diff --git a/dkim/tasks/main.yml b/dkim/tasks/main.yml
index 4a5f6c2b970ed866486725408dcb6746a8995b48..baad47ee4409df2de5370373e4cf3388381b56f0 100644
--- a/dkim/tasks/main.yml
+++ b/dkim/tasks/main.yml
@@ -6,7 +6,6 @@
       - opendkim
       - opendkim-tools
     state: present
-  
 
 - name: ensure opendkim config is present
   template:
@@ -16,7 +15,7 @@
 
 - name: ensure domain files are present
   template:
-    src: "{{item}}.j2"
-    dest: "/etc/opendkim/{{item}}"
-    with_items: 
-    
+    src: "{{ item }}.j2"
+    dest: "/etc/opendkim/{{ item }}"
+    with_items:
+      - dkim_domains