diff --git a/roles/deploy-env/tasks/client_cluster_tunnel.yaml b/roles/deploy-env/tasks/client_cluster_tunnel.yaml
index 41daac0bd..8a39f4ab6 100644
--- a/roles/deploy-env/tasks/client_cluster_tunnel.yaml
+++ b/roles/deploy-env/tasks/client_cluster_tunnel.yaml
@@ -51,7 +51,7 @@
         wg set client-wg listen-port 51820 private-key /root/wg-private-key peer {{ client_wg_public_key }} allowed-ips {{ tunnel_network_cidr }} endpoint {{ client_default_ip }}:51820
         ip link set client-wg up
         iptables -t filter -P FORWARD ACCEPT
-        iptables -t filter -I FORWARD -o client-gw -j ACCEPT
+        iptables -t filter -I FORWARD -o client-wg -j ACCEPT
         EOF
         chmod +x /tmp/configure_cluster_tunnel.sh
         /tmp/configure_cluster_tunnel.sh
diff --git a/roles/deploy-env/tasks/k8s_client.yaml b/roles/deploy-env/tasks/k8s_client.yaml
index 9a3b96cc8..7991e291b 100644
--- a/roles/deploy-env/tasks/k8s_client.yaml
+++ b/roles/deploy-env/tasks/k8s_client.yaml
@@ -40,7 +40,7 @@
 
 - name: "Set kubconfig file ownership for {{ kubectl.user }} user"
   shell: |
-    chown -R {{ kubectl.user }}:{{ kubectl.group }} /home/{{ kubectl.user }}/.kube
+    chown -R {{ kubectl.user }}:{{ kubectl.group }} {{ user_home_directory }}/.kube
 
 - name: Deploy Helm
   block: