diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml
index 6497d53..b5d1ed4 100644
--- a/roles/server/tasks/main.yml
+++ b/roles/server/tasks/main.yml
@@ -2,6 +2,7 @@
 # Load distro specific variables
 - include_vars: "{{ ansible_distribution }}.yml"
   tags: always
+- include:vars: "{{ ansible_fqdn }}.yml"
 
 - block:
   - include_tasks: system_setup/hosts.yml
diff --git a/roles/server/tasks/utilities/wireguard.yml b/roles/server/tasks/utilities/wireguard.yml
index 674bb44..97320e8 100644
--- a/roles/server/tasks/utilities/wireguard.yml
+++ b/roles/server/tasks/utilities/wireguard.yml
@@ -8,6 +8,20 @@
     cmd: umask 077 && wg genkey | tee privatekey | wg pubkey > publickey
     chdir: /etc/wireguard
     creates: /etc/wireguard/publickey
+  when:
+    - wg_privkey is not defined
+    - wg_pubkey is not defined
+
+- name: server | utilities | wireguard copy keys
+  copy:
+    content: "{{ item.key }}"
+    dest: "{{ item.keyfile }}"
+  loop:
+    - { key: wg_pubkey, keyfile: "/etc/wireguard/publickey" }
+    - { key: wg_privkey, keyfile: "/etc/wireguard/privatekey" }
+  when:
+    - wg_pubkey is defined
+    - wg_privkey is defined
 
 - name: server | utilities | wireguard generate config
   template: