diff --git a/.ansible/roles/lockdown/tasks/gpg.yml b/.ansible/roles/lockdown/tasks/gpg.yml
index 8ae2215..84156e2 100644
--- a/.ansible/roles/lockdown/tasks/gpg.yml
+++ b/.ansible/roles/lockdown/tasks/gpg.yml
@@ -1,24 +1,39 @@
 ---
 - name: Acquire GPG private keys from other system
   when: not files_mode
-  delegate_to: "{{ gpg_private_keys_origin_host }}"
-  ansible.builtin.command:
-    argv:
-      - gpg
-      - -a
-      - --export-secret-key
-      - "{{ item }}"
-  loop: "{{ gpg_origin_private_keyids }}"
-  register: gpg_secrets
-- name: Create GPG private keys
+  block:
+    - name: Acquire GPG private keys' contents from other system
+      delegate_to: "{{ gpg_private_keys_origin_host }}"
+      ansible.builtin.command:
+        argv:
+          - gpg
+          - -a
+          - --export-secret-key
+          - "{{ item }}"
+      loop: "{{ gpg_origin_private_keyids }}"
+      register: gpg_secrets
+    - name: Create GPG private keys using acquired GPG private keys' contents
+      ansible.builtin.copy:
+        content: "{{ item }}"
+        dest: "{{ ansible_facts['user_dir'] }}/.gnupg/{{ gpg_origin_private_keyids[idx] }}.priv.asc"
+        force: yes
+        backup: yes
+        mode: "0600"
+        state: present
+      loop: "{{ gpg_secrets.results }}"
+      loop_control:
+        index_var: idx
+      register: created_gpg_private_keys
+- name: Acquire GPG private keys
+  when: files_mode
   ansible.builtin.copy:
-    content: "{{ item }}"
-    dest: "{{ ansible_facts['user_dir'] }}/.gnupg/{{ ansible_facts['user_id'] }}-{{ idx }}.priv.asc"
+    src: gnupg/{{ item }}.asc
+    dest: "{{ ansible_facts['user_dir'] }}/.gnupg/{{ item }}.priv.asc"
     force: yes
     backup: yes
     mode: "0600"
     state: present
-  loop: "{{ gpg_secrets.results }}"
+  loop: "{{ gpg_origin_private_keyids }}"
   loop_control:
     index_var: idx
   register: created_gpg_private_keys