diff --git a/roles/rke2/tasks/config_rke2.yml b/roles/rke2/tasks/config_rke2.yml
index e85c62e17c5c7601b0694d08a47ae075452fc546..9645dc62bf2fcb6fd576b3b7e4c80229804849f1 100644
--- a/roles/rke2/tasks/config_rke2.yml
+++ b/roles/rke2/tasks/config_rke2.yml
@@ -16,7 +16,6 @@
     - group_vars
     - group_vars/all
 
-
 - name: slurp token if upgrade
   block:
   - name: Load token
@@ -27,13 +26,14 @@
     add_host:
       name: "MASTER_HOST"
       token: "{{ slurped_token.content}}"
-  - name: create token
-    delegate_to: localhost
-    run_once: yes
-    set_fact:
-      token: "{{ hostvars['MASTER_HOST']['token'].split('server:')[1] }}"
   when: upgrade and ('master' in group_names)
 
+- name: set token
+  delegate_to: localhost
+  run_once: yes
+  set_fact:
+    token: "{{ hostvars['MASTER_HOST']['token'].split('server:')[1] }}"
+  when: upgrade
 
 - name: store token
   delegate_to: localhost
@@ -43,7 +43,6 @@
     dest: group_vars/all/token.yml
     content: |-
       token: {{ token }}
-  when: not upgrade
 
 - name: read token
   include_vars: group_vars/all/token.yml