diff --git a/roles/rke2/tasks/fix_selinux.yml b/roles/rke2/tasks/fix_selinux.yml
index 32032d94767cc36e2d6769fc8a132c331745c5d3..2a202f71af554bd8f387ae4c08793d4a061f01cf 100644
--- a/roles/rke2/tasks/fix_selinux.yml
+++ b/roles/rke2/tasks/fix_selinux.yml
@@ -18,7 +18,7 @@
   until: item in control_plane_pods_created.stdout
   retries: 10
   delay: 30
-  when: state != 'absent' and 'master' in group_names
+  when: ( 'master' in group_names)
   with_items:
     - etcd
     - kube-apiserver
@@ -28,6 +28,8 @@
 - name: Wait for openstack-cloud-controller deamon set to be ready
   shell: "/var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml wait --namespace=kube-system --for=condition=Ready pods --selector app=openstack-cloud-controller-manager --timeout=360s"
   register: openstack_ccm_ready
+  when: ('master' in group_names)
+
 
 - debug: var=openstack_ccm_ready.stdout_lines
 
diff --git a/roles/rke2/tasks/install_rke2.yml b/roles/rke2/tasks/install_rke2.yml
index 036c364637ad765a33dba3e2dd515404cce3677e..3c15e5079c47358eb408d0c3c7af6fadc59fb6b0 100644
--- a/roles/rke2/tasks/install_rke2.yml
+++ b/roles/rke2/tasks/install_rke2.yml
@@ -14,16 +14,6 @@
     INSTALL_RKE2_CHANNEL: "{{ rke2_channel }}"
     INSTALL_RKE2_TYPE: "{{ node_type }}"
   
-
-#- name: Upgrade RKE2
-#  command: "/tmp/rke2.sh"
-#  environment:
-#    INSTALL_RKE2_VERSION: "{{ rke2_version }}"
-#    INSTALL_RKE2_CHANNEL: "{{ rke2_channel }}"
-#    INSTALL_RKE2_TYPE: "{{ node_type }}"
-#  when: upgrade
-#  notify: restart rke2
-
 - name: install RHEL RKE2 packages
   dnf:
     name: