diff --git a/tasks/configure.yml b/tasks/configure.yml
index 239045d..504be1e 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -32,6 +32,7 @@
   file:
     path: /etc/dkimkeys/{{ item }}
     state: directory
+    mode: '0770'
   loop: "{{ mail_domains }}"
 
 - name: Generate DKIM keys
@@ -103,7 +104,7 @@
     state: directory
     owner: root
     group: opendkim
-    mode: 0770
+    mode: '0770'
 
 - name: Configure keytable for OpenDKIM
   template:
diff --git a/templates/keytable.j2 b/templates/keytable.j2
index 4203b0e..56ba5c3 100644
--- a/templates/keytable.j2
+++ b/templates/keytable.j2
@@ -1,3 +1,3 @@
 {% for domain in mail_domains %}
-{{ dkim_selector }}._domainkey.{{ domain }} {{ domain }}:default:/etc/opendkim/{{ domain }}.private
+{{ dkim_selector }}._domainkey.{{ domain }} {{ domain }}:default:/etc/dkimkeys/{{ domain }}/default.private
 {% endfor %}