diff --git a/playbooks/services/wireguard-client-gen.yml b/playbooks/services/wireguard-client-gen.yml
index 4cfe3ef..8bbaa22 100644
--- a/playbooks/services/wireguard-client-gen.yml
+++ b/playbooks/services/wireguard-client-gen.yml
@@ -1,21 +1,20 @@
-- name: wireguard-client-gen
+- name: Generate WireGuard Client Configuration
   hosts: localhost
- #connection: local
+  gather_facts: false
+
   vars_files:
     - ../../group_vars/vault.yml
     - ../../group_vars/all.yml
+
   vars:
     user: matej
-    IP: "{{ lookup('vars', 'wireguard-client')[user]['ip'] }}"
-    priv: "{{ lookup('vars', 'wireguard-client-vault')[user]['pub'] }}"
 
   tasks:
-    - name: Copy from template
-      template:
-        src: ../../roles/wireguard_server/templates/wireguardclient.conf
-        dest: ~/{{ user }}.conf
-        owner: "{{ ansible_user_id }}"
-        group: "{{ ansible_user_id }}"
-        mode: '0644'
-  
-  
+    - name: Include wireguard_server role to generate client config
+      ansible.builtin.include_role:
+        name: wireguard_server
+        tasks_from: generate_client
+      vars:
+        # Pass the required variables to the role
+        IP: "{{ lookup('vars', 'wireguard-client')[user]['ip'] }}"
+        priv: "{{ lookup('vars', 'wireguard-client-vault')[user]['pub'] }}"
diff --git a/roles/wireguard_server/tasks/generate_client.yml b/roles/wireguard_server/tasks/generate_client.yml
new file mode 100644
index 0000000..cb0400f
--- /dev/null
+++ b/roles/wireguard_server/tasks/generate_client.yml
@@ -0,0 +1,9 @@
+---
+- name: Generate WireGuard client config
+  template:
+    src: wireguardclient.conf
+    dest: "{{ lookup('env', 'HOME') }}/{{ user }}.conf"
+    owner: "{{ ansible_user_id }}"
+    group: "{{ ansible_user_id }}"
+    mode: '0644'
+  delegate_to: localhost