diff --git a/roles/keys/tasks/main.yml b/roles/keys/tasks/main.yml
index 1fc03734cab7db8f9d15d3b2047479e4382a31e9..333b155e551a08c9db856b530afbc99383a6a25c 100644
--- a/roles/keys/tasks/main.yml
+++ b/roles/keys/tasks/main.yml
@@ -7,8 +7,11 @@
   shell:
     cmd: umask 077
   shell:
+    chdir: /etc/wireguard
+    creates: /etc/wireguard/publickey
     cmd: wg genkey | tee privatekey | wg pubkey > publickey
-
+  become: yes
+  
 - name: key-get
   command: cat publickey
   register: public_key
diff --git a/templates/wg b/templates/wg
index d4858ab07872a30f56fb9e2cec1d5b7ec910da2d..742d911d6f9037a4ab2a8a7a8c3282a07ab7f7d3 100644
--- a/templates/wg
+++ b/templates/wg
@@ -1,6 +1,6 @@
 [Interface]
 Address = {{ myAddr }}
-PostUp = wg set %i private-key /home/gitlab-runner/privatekey
+PostUp = wg set %i private-key /etc/wireguard/privatekey
 ListenPort = 51902
 
 [Peer]