diff --git a/roles/rke2/tasks/config_ccm.yml b/roles/rke2/tasks/config_ccm.yml
index 8f45d6df69f6eb507619c5c5f5ba6d63a3849da0..c92bc4d252bc30581e7b318e8feac5095b49f6d8 100644
--- a/roles/rke2/tasks/config_ccm.yml
+++ b/roles/rke2/tasks/config_ccm.yml
@@ -14,14 +14,13 @@
     src: cloud.conf.j2
     dest: /tmp/cloud.conf
 
-- name: apply secrets for CCM
+- name: create secrets for CCM
   ansible.builtin.shell:
-    executable: /var/lib/rancher/rke2/bin/kubectl
-    cmd: create secret generic --namespace kube-system cloud-config --from-file=cloud.conf=/tmp/cloud.conf \
+    cmd: /var/lib/rancher/rke2/bin/kubectl create secret generic --namespace kube-system cloud-config --from-file=cloud.conf=/tmp/cloud.conf
   environment:
     KUBECONFIG: /etc/rancher/rke2/rke2.yaml
 
-- name: remove /tmp/cloud.conf on remote
+- name: remove /tmp/cloud.conf on master
   ansible.builtin.file:
     path: /tmp/cloud.conf
     state: absent
\ No newline at end of file
diff --git a/roles/rke2/tasks/config_rke2.yml b/roles/rke2/tasks/config_rke2.yml
index 3deb552faa39272b140f796fd1969fc79998d2c3..29f858aac05f5f44db08f7eff83d5a6016447840 100644
--- a/roles/rke2/tasks/config_rke2.yml
+++ b/roles/rke2/tasks/config_rke2.yml
@@ -1,5 +1,4 @@
 - name: slurp token
-  when: ('master' in group_names)
   block:
   - name: Load token
     slurp:
diff --git a/roles/rke2/tasks/main.yml b/roles/rke2/tasks/main.yml
index 1abc6c3976588e014c744fc2ce7c846ac67085dd..aa24ecaea12db6b1a26bff22e86821e155116dc1 100644
--- a/roles/rke2/tasks/main.yml
+++ b/roles/rke2/tasks/main.yml
@@ -31,7 +31,6 @@
 
 - name: Flush handlers
   meta: flush_handlers
-  when: state != 'absent'
 
 - name: configure Openstack Cloud Controller Manager
   include_tasks: config_ccm.yml