diff --git a/roles/rke2/tasks/config_rke2.yml b/roles/rke2/tasks/config_rke2.yml
index a348adc7a4848cec2437f575ce7bc136cc371848..299a11f9f40e0c583de018c78a7ed7cba69efb9c 100644
--- a/roles/rke2/tasks/config_rke2.yml
+++ b/roles/rke2/tasks/config_rke2.yml
@@ -17,21 +17,23 @@
     - group_vars/all
 
 - name: slurp token if upgrade
-  when: upgrade and ('master' in group_names)
   block:
-    - name: Load token
-      slurp:
-        src: "/var/lib/rancher/rke2/server/node-token"
-      register: slurped_token
-    - name: Decode token and store as fact at dummy master_host with host variable
-      add_host:
-        name: "MASTER_HOST"
-        token: "{{ slurped_token.content | b64decode | trim }}"
-    - name: set token
-      delegate_to: localhost
-      run_once: true
-      set_fact:
-        token: "{{ hostvars['MASTER_HOST']['token'].split('server:')[1] }}"
+  - name: Load token
+    slurp:
+      src: "/var/lib/rancher/rke2/server/node-token"
+    register: slurped_token
+    when: upgrade and ('master' in group_names)
+  - name: Decode token and store as fact at dummy master_host with host variable
+    add_host:
+      name: "MASTER_HOST"
+      token: "{{ slurped_token.content | b64decode | trim }}"
+    when: upgrade and ('master' in group_names)
+  - name: set token
+    delegate_to: localhost
+    run_once: true
+    set_fact:
+      token: "{{ hostvars['MASTER_HOST']['token'].split('server:')[1] }}"
+    when: upgrade and ('master' in group_names)
 
 - name: store token
   delegate_to: localhost