diff --git a/roles/wireguard/tasks/keys.yml b/roles/wireguard/tasks/keys.yml
index 8c9bbdc3a..0deaef654 100644
--- a/roles/wireguard/tasks/keys.yml
+++ b/roles/wireguard/tasks/keys.yml
@@ -38,45 +38,6 @@
       - "{{ IP_subject_alt_name }}"
   when: wg_genkey.changed
 
-- name: Delete the preshared lock files
-  file:
-    dest: "{{ config_prefix|default('/') }}etc/wireguard/preshared_{{ item }}.lock"
-    state: absent
-  when: keys_clean_all|bool
-  with_items:
-    - "{{ users }}"
-    - "{{ IP_subject_alt_name }}"
-
-- name: Generate preshared keys
-  command: wg genpsk
-  register: wg_genpsk
-  args:
-    creates: "{{ config_prefix|default('/') }}etc/wireguard/preshared_{{ item }}.lock"
-  with_items:
-    - "{{ users }}"
-    - "{{ IP_subject_alt_name }}"
-
-- block:
-  - name: Save preshared keys
-    copy:
-      dest: "{{ wireguard_pki_path }}/preshared/{{ item['item'] }}"
-      content: "{{ item['stdout'] }}"
-      mode: "0600"
-    no_log: true
-    when: item.changed
-    with_items: "{{ wg_genpsk['results'] }}"
-    delegate_to: localhost
-    become: false
-
-  - name: Touch the preshared lock file
-    file:
-      dest: "{{ config_prefix|default('/') }}etc/wireguard/preshared_{{ item }}.lock"
-      state: touch
-    with_items:
-      - "{{ users }}"
-      - "{{ IP_subject_alt_name }}"
-  when: wg_genpsk.changed
-
 - name: Generate public keys
   shell: |
     set -o pipefail
diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml
index c34580b5e..4434d091f 100644
--- a/roles/wireguard/tasks/main.yml
+++ b/roles/wireguard/tasks/main.yml
@@ -7,7 +7,6 @@
   with_items:
     - private
     - public
-    - preshared
   delegate_to: localhost
   become: false
 
diff --git a/roles/wireguard/templates/client.conf.j2 b/roles/wireguard/templates/client.conf.j2
index cfa844e96..5a4a759f3 100644
--- a/roles/wireguard/templates/client.conf.j2
+++ b/roles/wireguard/templates/client.conf.j2
@@ -7,7 +7,6 @@ DNS = {{ wireguard_dns_servers }}
 
 [Peer]
 PublicKey = {{ lookup('file', wireguard_pki_path + '/public/' + IP_subject_alt_name) }}
-PresharedKey = {{ lookup('file', wireguard_pki_path + '/preshared/' + item.1) }}
 AllowedIPs = 0.0.0.0/0{{ ', ::/0'  if ipv6_support else '' }}
 Endpoint = {{ IP_subject_alt_name }}:{{ wireguard_port }}
 {{ 'PersistentKeepalive = ' + wireguard_PersistentKeepalive|string if wireguard_PersistentKeepalive > 0 else '' }}
diff --git a/roles/wireguard/templates/server.conf.j2 b/roles/wireguard/templates/server.conf.j2
index b7a8580a0..46c280deb 100644
--- a/roles/wireguard/templates/server.conf.j2
+++ b/roles/wireguard/templates/server.conf.j2
@@ -11,7 +11,6 @@ SaveConfig = false
 [Peer]
 # {{ u }}
 PublicKey = {{ lookup('file', wireguard_pki_path + '/public/' + u) }}
-PresharedKey = {{ lookup('file', wireguard_pki_path + '/preshared/' + u) }}
 AllowedIPs = {{ wireguard_network_ipv4 | ipaddr(index|int+1) | ipv4('address') }}/32{{ ',' + wireguard_network_ipv6 | ipaddr(index|int+1) | ipv6('address') + '/128' if ipv6_support else '' }}
 {% endif %}
 {% endfor %}