diff --git a/tasks/first_server.yml b/tasks/first_server.yml
index d65efad..22358fa 100644
--- a/tasks/first_server.yml
+++ b/tasks/first_server.yml
@@ -168,9 +168,7 @@
 
     - name: Get all node names
       ansible.builtin.set_fact:
-        node_names: "{{ hostvars | dict2items | map(attribute='value.rke2_node_name') }}"
-      run_once: true
-      register: node_names
+        node_names: "{{ groups[rke2_cluster_group_name] | map('extract', hostvars) | map(attribute='rke2_node_name') }}"
 
     - name: Remove old <node>.node-password.rke2 secrets
       ansible.builtin.shell: |
@@ -178,7 +176,7 @@
         delete secret {{ item }}.node-password.rke2 -n kube-system 2>&1 || true
       args:
         executable: /bin/bash
-      with_items: "{{ registered_node_names.stdout_lines | difference(node_names) }}"
+      with_items: "{{ registered_node_names.stdout_lines | difference([rke2_node_name]) }}"
       changed_when: false
 
     - name: Remove old nodes