diff --git a/roles/rke2/tasks/kubeconfig.yml b/roles/rke2/tasks/kubeconfig.yml
index b88d655ffdf561f60e03ee6eff4ca40b5ab5d157..103e4440042e83f42e0f0793cbd4c70d59f024ad 100644
--- a/roles/rke2/tasks/kubeconfig.yml
+++ b/roles/rke2/tasks/kubeconfig.yml
@@ -12,12 +12,14 @@
 - name: wait for kubeconfig
   wait_for:
     path: /etc/rancher/rke2/rke2.yaml
+  when:   'master' in group_names 
 
 - name: fetch kubeconfig from master
   ansible.builtin.fetch:
     src: /etc/rancher/rke2/rke2.yaml
     dest: kubeconfig.yaml
     flat: yes
+  when:   'master' in group_names 
 
 - name: replace endpoint in kubeconfig NEW
   delegate_to: localhost
@@ -26,12 +28,14 @@
     path: kubeconfig.yaml
     regexp: '^(\s+server: ).*'
     replace: '\1https://{{ lb_ip_mgmt }}:6443'
+  when:   'master' in group_names 
 
 - name: fetch kubeconfig from master and copy it 
   ansible.builtin.fetch:
     src: /etc/rancher/rke2/rke2.yaml
     dest: kubeconfigext.yaml
     flat: yes
+  when:   'master' in group_names 
 
 
 - name: replace endpoint in external kubeconfig
@@ -40,4 +44,5 @@
   ansible.builtin.replace:
     path: kubeconfigext.yaml
     regexp: '^(\s+server: ).*'
-    replace: '\1https://rancher.{{ domain }}:6443'
\ No newline at end of file
+    replace: '\1https://rancher.{{ domain }}:6443'
+  when:   'master' in group_names 
\ No newline at end of file
diff --git a/roles/rke2/tasks/main.yml b/roles/rke2/tasks/main.yml
index 38293ae0ca67d580d219d1533b11682ddae135e1..185e567a8268449b0654e42bcc9d08c6b5dda4c1 100644
--- a/roles/rke2/tasks/main.yml
+++ b/roles/rke2/tasks/main.yml
@@ -17,11 +17,11 @@
   when: state != 'absent' 
 
 - include_tasks: kubeconfig.yml
-  when: state != 'absent' and 'master' in group_names 
+  when: state != 'absent' #and 'master' in group_names 
 
 # Flush the handlers only for fresh installs
-- name: Flush handlers
-  meta: flush_handlers
+#- name: Flush handlers
+#  meta: flush_handlers
 
   
 #This task runs only after the full installer went through and had a bit of time to boot, then starts to enforce SELinux