diff --git a/defaults/main.yml b/defaults/main.yml
index e620042..5eccc18 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,4 +5,4 @@ kubernetes_server: false
 # value for kuberntes_network: flannel, calico, weave-net
 #kubernetes_network: weave-net
 kubernetes_kubeproxy_mode: ipvs
-kubernetes_version: 1.19.3
+kubernetes_version: 1.18.3
diff --git a/tasks/cluster_k3s.yml b/tasks/cluster_k3s.yml
index 14875eb..c46469f 100644
--- a/tasks/cluster_k3s.yml
+++ b/tasks/cluster_k3s.yml
@@ -1,10 +1,4 @@
 ---
-- name: Install Wireguard
-  include_role:
-    name: wireguard
-#  when:
-#    - kubernetes_cni == "wireguard"
-
 - name: Check if /usr/local/bin/k3s already existe
   stat:
     path: /usr/local/bin/k3s
@@ -19,7 +13,7 @@
     owner: root
     mode: 0755
   when:
-    - not k3s_bin.stat.exists
+    - k3s_bin.stat.exists
     - ansible_machine == "x86_64"
 
 - name: retreive k3s binary for arm64
@@ -30,7 +24,7 @@
     owner: root
     mode: 0755
   when:
-    - not k3s_bin.stat.exists
+    - k3s_bin.stat.exists
     - ansible_machine == "arm64"
 
 - name: retreive k3s binary for armv6/armv7
@@ -41,7 +35,7 @@
     owner: root
     mode: 0755
   when:
-    - not k3s_bin.stat.exists
+    - k3s_bin.stat.exists
     - (ansible_machine == "armv7l") or (ansible_machine == "armv6l")
 
 - name: Create tools link
@@ -78,14 +72,14 @@
     thinpool: kubernetes
     size: "{{ item.size }}"
   with_items:
-    - { name: var_lib_k3s, vg: vg_sys, size: 10g, mount_point: /var/lib/rancher/k3s, mount_opts: "discard"}
+    - { name: var_lib_k3s, vg: vg_sys, size: 10g, mount_point: /var/lib/rancher/k3s}
 
 - name: create file system on containerd lv
   filesystem:
     fstype: ext4
     dev: "/dev/{{ item.vg }}/{{ item.name }}"
   with_items:
-    - { name: var_lib_k3s, vg: vg_sys, size: 10g, mount_point: /var/lib/rancher/k3s, mount_opts: "discard"}
+    - { name: var_lib_k3s, vg: vg_sys, size: 10g, mount_point: /var/lib/rancher/k3s}
 
 - name: mount logical volumes
   mount:
@@ -95,7 +89,7 @@
     opts: "{{ item.mount_opts }}"
     state: mounted
   with_items:
-    - { name: var_lib_k3s, vg: vg_sys, size: 10g, mount_point: /var/lib/rancher/k3s, mount_opts: "discard"}
+    - { name: var_lib_k3s, vg: vg_sys, size: 10g, mount_point: /var/lib/rancher/k3s}
 
 - name: Enable k3s on boot
   service:
diff --git a/tasks/cluster_kubeadm.yml b/tasks/cluster_kubeadm.yml
index dca5102..fb037b2 100644
--- a/tasks/cluster_kubeadm.yml
+++ b/tasks/cluster_kubeadm.yml
@@ -75,7 +75,6 @@
     fstype: ext4
     opts: "{{ item.mount_opts }}"
     state: mounted
-  register: partition_formated
   with_items:
     - { name: var_lib_etcd, vg: vg_sys, size: 1g, mount_point: /var/lib/etcd, mount_opts: "nodev,noexec,nosuid,discard"}
     - { name: etc_kubernetes, vg: vg_sys, size: 1g, mount_point: /etc/kubernetes, mount_opts: "nodev,noexec,nosuid,discard"}
@@ -83,13 +82,6 @@
   when:
     - kubernetes_master|bool
 
-- name: Ensuring /var/lib/etcd/lost+found Folder does not exists
-  file:
-    path: "/var/lib/etcd/lost+found"
-    state: "absent"
-  when:
-    - partition_formated is changed
-
 - name: Secure etcd directory
   file:
     path: "/var/lib/etcd"
diff --git a/templates/etc/systemd/system/k3s.service.env.j2 b/templates/etc/systemd/system/k3s.service.env.j2
index 980b10e..58104e7 100644
--- a/templates/etc/systemd/system/k3s.service.env.j2
+++ b/templates/etc/systemd/system/k3s.service.env.j2
@@ -1,3 +1,3 @@
-{% if not kubernetes_master|bool %}
+{% if kubernetes_master|bool %}
 NODE_TOKEN={{ kubernetes_server_token }}
 {% endif %}
\ No newline at end of file