diff --git a/roles/rke2/tasks/fix_selinux.yml b/roles/rke2/tasks/fix_selinux.yml
index 2a202f71af554bd8f387ae4c08793d4a061f01cf..06824ae444ec6a2daa38cab322fadfce4f7bc26c 100644
--- a/roles/rke2/tasks/fix_selinux.yml
+++ b/roles/rke2/tasks/fix_selinux.yml
@@ -12,13 +12,13 @@
     semodule -i /etc/selinux/targeted/policy/my-openstack.pp
 
 
-- name: Wait for all control-plane pods become created
+- name: Wait for all control-plane pods to become created
   shell: "/var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml get po --namespace=kube-system --selector tier=control-plane --output=jsonpath='{.items[*].metadata.name}'"
   register: control_plane_pods_created
   until: item in control_plane_pods_created.stdout
   retries: 10
   delay: 30
-  when: ( 'master' in group_names)
+  ignore_errors: True
   with_items:
     - etcd
     - kube-apiserver
@@ -28,11 +28,9 @@
 - 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)
+  ignore_errors: True
 
 
-- debug: var=openstack_ccm_ready.stdout_lines
-
 - name: Enable SELinux
   selinux:
     policy: targeted