diff --git a/roles/kubernetes/tasks/Rocky.yml b/roles/kubernetes/tasks/Rocky.yml
index d58a68b..c0aaf2a 100644
--- a/roles/kubernetes/tasks/Rocky.yml
+++ b/roles/kubernetes/tasks/Rocky.yml
@@ -196,16 +196,6 @@
         worker_join_cmd: "{{ join_command.stdout }}"
       when: inventory_hostname.endswith('-vm01.home.lan')
 
-    - name: Save manager hostname for workers
-      set_fact:
-        kube_manager: "{{ inventory_hostname }}"
-      when: inventory_hostname.endswith('-vm01.home.lan')
-
-    - name: "Debug manager hostname: {{ kube_manager }}"
-      debug:
-        var: kube_manager
-      run_once: true
-
 
     - name: Print join command
       debug:
@@ -224,8 +214,9 @@
       delay: 15
       when: inventory_hostname.endswith('-vm01.home.lan')
 
-    - name: Join cluster
-      command: "{{ hostvars[kube_manager].worker_join_cmd }}"
-      args:
-        creates: /etc/kubernetes/kubelet.conf
-      when: inventory_hostname.endswith('-vm01.home.lan') == false
\ No newline at end of file
+- name: Join cluster
+  command: >-
+    {{ hostvars['rocky' ~ ansible_distribution_major_version ~ '-vm01.home.lan'].worker_join_cmd }}
+  args:
+    creates: /etc/kubernetes/kubelet.conf
+  when: not inventory_hostname.endswith('-vm01.home.lan')
\ No newline at end of file