diff --git a/defaults/main.yml b/defaults/main.yml
index c0af613..5446569 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,6 +6,6 @@ kubernetes_interface: '{{ ansible_default_ipv4.interface }}'
 # value for kuberntes_network: flannel, calico, weave-net
 #kubernetes_network: weave-net
 kubernetes_kubeproxy_mode: ipvs
-kubernetes_version: 1.21.4
+kubernetes_version: 1.22.2
 kubernetes_pods_network: "10.244.0.0/16"
 lb_auth_pass: 1be344d62acc46c6858ae8475668a245
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index fec66e8..4c469ed 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -21,7 +21,7 @@
 #    - not ansible_machine == "armv6l"
 #    - kubernetes_cri != "k3s"
 
-- name: Add Official kubernetes's repo
+- name: Add Official kubernetes's repo on servers
   yum_repository:
     name: kubernetes
     description: Kubernetes
@@ -35,8 +35,24 @@
   when:
     - not ansible_machine == "armv7l"
     - not ansible_machine == "armv6l"
+    - kubernetes_server|bool
     - kubernetes_cri != "k3s"
 
+- name: Add Official kubernetes's repo for Desktop
+  yum_repository:
+    name: kubernetes
+    description: Kubernetes
+    baseurl: https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch
+    enabled: true
+    gpgcheck: true
+    repo_gpgcheck: true
+    gpgkey: https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+  become: true
+  when:
+    - not ansible_machine == "armv7l"
+    - not ansible_machine == "armv6l"
+    - not kubernetes_server|bool
+
 #- name: redhat | Installing K8s Packages
 #  package:
 #    name:
diff --git a/tasks/cluster_k3s.yml b/tasks/cluster_k3s.yml
index dd0fe42..c5fd4b4 100644
--- a/tasks/cluster_k3s.yml
+++ b/tasks/cluster_k3s.yml
@@ -29,7 +29,7 @@
 
 - name: retreive k3s binary for x86_64
   get_url:
-    url: "https://github.com/rancher/k3s/releases/download/v1.21.4%2Bk3s1/k3s"
+    url: "https://github.com/rancher/k3s/releases/download/v1.22.2%2Bk3s1/k3s"
     dest: "/usr/local/bin/k3s"
     group: root
     owner: root
@@ -40,7 +40,7 @@
 
 - name: retreive k3s binary for arm64
   get_url:
-    url: "https://github.com/rancher/k3s/releases/download/v1.21.4%2Bk3s1/k3s-arm64"
+    url: "https://github.com/rancher/k3s/releases/download/v1.22.2%2Bk3s1/k3s-arm64"
     dest: "/usr/local/bin/k3s"
     group: root
     owner: root
@@ -51,7 +51,7 @@
 
 - name: retreive k3s binary for armv6/armv7
   get_url:
-    url: "https://github.com/rancher/k3s/releases/download/v1.21.4%2Bk3s1/k3s-armhf"
+    url: "https://github.com/rancher/k3s/releases/download/v1.22.2%2Bk3s1/k3s-armhf"
     dest: "/usr/local/bin/k3s"
     group: root
     owner: root
diff --git a/tasks/main.yml b/tasks/main.yml
index 5fe21e7..c13136d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,57 +1,61 @@
 ---
-- name: Include vars for {{ ansible_os_family }}
-  include_vars: "{{ ansible_os_family }}.yml"
+- name: Kubernetes Install
+  tags:
+    - kubernetes
+  block:
+  - name: Include vars for {{ ansible_os_family }}
+    include_vars: "{{ ansible_os_family }}.yml"
 
-- name: Define vars for master
-  set_fact:
-    kubernetes_server: true
-    kubernetes_master: true
-    kubernetes_master_taint: false
-  when:
-    - "'KubernetesMasters' in group_names"
-    - "'KubernetesNodes' not in group_names"
+  - name: Define vars for master
+    set_fact:
+      kubernetes_server: true
+      kubernetes_master: true
+      kubernetes_master_taint: false
+    when:
+      - "'KubernetesMasters' in group_names"
+      - "'KubernetesNodes' not in group_names"
 
-- name: Define vars for node
-  set_fact:
-    kubernetes_server: true
-    kubernetes_master: false
-    kubernetes_master_taint: false
-  when:
-    - "'KubernetesNodes' in group_names"
-    - "'KubernetesMasters' not in group_names"
+  - name: Define vars for node
+    set_fact:
+      kubernetes_server: true
+      kubernetes_master: false
+      kubernetes_master_taint: false
+    when:
+      - "'KubernetesNodes' in group_names"
+      - "'KubernetesMasters' not in group_names"
 
-- name: Define vars for taint master
-  set_fact:
-    kubernetes_server: true
-    kubernetes_master: true
-    kubernetes_master_taint: true
-  when:
-    - "'KubernetesNodes' in group_names"
-    - "'KubernetesMasters' in group_names"
+  - name: Define vars for taint master
+    set_fact:
+      kubernetes_server: true
+      kubernetes_master: true
+      kubernetes_master_taint: true
+    when:
+      - "'KubernetesNodes' in group_names"
+      - "'KubernetesMasters' in group_names"
 
-- name: Define vars for tooling
-  set_fact:
-    kubernetes_sever: false
-  when:
-    - "'KubernetesMasters' not in group_names"
-    - "'KubernetesNodes' not in group_names"
+  - name: Define vars for tooling
+    set_fact:
+      kubernetes_sever: false
+    when:
+      - "'KubernetesMasters' not in group_names"
+      - "'KubernetesNodes' not in group_names"
 
-- name: Install kubernetes rules for {{ ansible_os_family }} OS family
-  include_tasks: "{{ ansible_os_family }}.yml"
+  - name: Install kubernetes rules for {{ ansible_os_family }} OS family
+    include_tasks: "{{ ansible_os_family }}.yml"
 
-#- name: Install kubernetes tools
-#  package:
-#    name: "{{ kubernetes_package_name }}"
-#    state: present
-#    update_cache: yes
-##  notify: Restart kubelet
-#  when:
-#    - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
+  #- name: Install kubernetes tools
+  #  package:
+  #    name: "{{ kubernetes_package_name }}"
+  #    state: present
+  #    update_cache: yes
+  ##  notify: Restart kubelet
+  #  when:
+  #    - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
 
-- name: Include kubernetes server rules
-  include_tasks: "install_server.yml"
-  when:
-    - kubernetes_server|bool
+  - name: Include kubernetes server rules
+    include_tasks: "install_server.yml"
+    when:
+      - kubernetes_server|bool
 
-#- name: Install python library for docker
-#  package: name="{{ python_openshift_lib }}" state=latest update_cache=yes
+  #- name: Install python library for docker
+  #  package: name="{{ python_openshift_lib }}" state=latest update_cache=yes