diff --git a/tasks/borg.yml b/tasks/borg.yml
index 3975489..7002806 100644
--- a/tasks/borg.yml
+++ b/tasks/borg.yml
@@ -28,10 +28,11 @@
 
 - name: "Borg | Export repo key"
   ansible.builtin.command:
-    cmd: "borg key export {{ item }} > {{ borg_key_export_path }}/{{ item }}.key"
+    cmd: "borg key export {{ item }} {{ borg_key_export_path }}/{{ item | replace('ssh://', '') | replace('@', '') | replace('.', '_') | replace('/', '') }}"
   loop: "{{ borg_repository }}"
 
 - name: "Borg | Save repo key to localhost"
-  ansible.builtin.fetch:
-    src: "{{ repo_key_export.stdout }}"
+  ansible.posix.synchronize:
+    mode: pull
+    src: "{{ borg_key_export_path }}"
     dest: "~/"