diff --git a/roles/k8s-worker/tasks/main.yml b/roles/k8s-worker/tasks/main.yml
index 6abc6f7..40c97fa 100644
--- a/roles/k8s-worker/tasks/main.yml
+++ b/roles/k8s-worker/tasks/main.yml
@@ -7,11 +7,23 @@
   - kubeadm-join
 
 - name: add node to cluster
-  #when:
-  #  not stat_kublet_config.stat.exists
+  when:
+    stat_kubelet_config is not defined or not stat_kublet_config.stat.exists
   tags:
   - kubeadm-join
   block:
+  - name: get kubernetes cluster info
+    set_fact:
+      cluster_info: >-
+        {{ query(
+               "kubernetes.core.k8s",
+               kind="ConfigMap",
+               namespace="kube-public",
+               resource_name="cluster-info",
+          )[0] }}
+    tags:
+    - cluster-info
+
   - name: generate bootstrap token
     set_fact:
       bootstrap_token_id: >-
@@ -48,21 +60,9 @@
     tags:
     - bootstrap-token
 
-  - name: get cluster info
-    delegate_to: localhost
-    become: false
-    kubernetes.core.k8s:
-      namespace: kube-public
-      api_version: v1
-      kind: ConfigMap
-      name: cluster-info
-    register: cluster_info
-    tags:
-    - cluster-info
-
   - name: generate kubeconfig for kubeadm join
     vars:
-      kubeconfig: '{{ cluster_info.result.data.kubeconfig | from_yaml }}'
+      kubeconfig: '{{ cluster_info.data.kubeconfig | from_yaml }}'
       config:
         apiVersion: v1
         kind: Config