diff --git a/tasks/configure.yml b/tasks/configure.yml
index 0f3ca8d..c5234a4 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -29,9 +29,9 @@
   when: opendkim_genkey_cmd is not defined
 
 - name: Generate DKIM keys
-  shell: "{{opendkim_genkey_cmd }} -D /etc/dkimkeys --domain={{ item }} --selector={{ dkim_selector }}"
+  shell: "{{opendkim_genkey_cmd }} -D /etc/dkimkeys/{{ item }} --domain={{ item }} --selector={{ dkim_selector }}"
   args:
-    creates: "/etc/dkimkeys/{{ item }}.txt"
+    creates: "/etc/dkimkeys/{{ item }}/{{ dkim_selector }}.txt"
   loop: "{{ mail_domains }}"
   notify: Restart OpenDKIM service
 
diff --git a/tasks/configure_ovh.yml b/tasks/configure_ovh.yml
index 3160286..3555824 100644
--- a/tasks/configure_ovh.yml
+++ b/tasks/configure_ovh.yml
@@ -1,7 +1,7 @@
 ---
 - name: Get DKIM key
   slurp:
-    src: "/etc/dkimkeys/{{ item }}.txt"
+    src: "/etc/dkimkeys/{{ item }}/{{ dkim_selector }}.txt"
   register: key_file
   loop: "{{ mail_domains }}"