diff --git a/roles/rke2/tasks/fix_selinux.yml b/roles/rke2/tasks/fix_selinux.yml
index fbdd3d9369a78bc29d013d4681853e1aa7e9b5d8..8b2ba35c2802662cedec0c8ea37bd0b238c50d3e 100644
--- a/roles/rke2/tasks/fix_selinux.yml
+++ b/roles/rke2/tasks/fix_selinux.yml
@@ -1,7 +1,3 @@
-#- name: Sleep for 30 seconds so that the helm operator has deployed the deamonset
-#  ansible.builtin.wait_for:
-#    timeout: 30
-#  delegate_to: localhost
 
 - name: make sure we re in permissive mode
   shell: "setenforce 0 "
@@ -13,38 +9,13 @@
 - name: kill the openstack ccm pods to make sure they boot in permissive mode
   shell: "/var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml rollout restart -n kube-system ds openstack-cloud-controller-manager "
   register: openstack_ccm_ready
-#  until: openstack_ccm_ready.stdout
-#  retries: 2
-#  delay: 30
   when: ( 'master' in group_names )
   ignore_errors: True
 
-# - name: Sleep for another 30 seconds so that the OS-CCM has had time to boot up
-#   ansible.builtin.wait_for:
-#     timeout: 30
-#   delegate_to: localhost
-
-
-# - 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: 1
-#   delay: 30
-#   when: ('master' in group_names )
-#   ignore_errors: True
-#   with_items:
-#     - etcd
-#     - kube-apiserver
-#     - kube-controller-manager
-#     - kube-scheduler
 
 - 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 ds openstack-cloud-controller-manager --timeout=360s"
+  shell: "/var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml wait --namespace=kube-system --for=condition=Ready ds openstack-cloud-controller-manager --timeout=120s"
   register: openstack_ccm_ready
-  #until: openstack_ccm_ready.stdout
-  #retries: 2
-  #delay: 30
   ignore_errors: True
 
 - name: Enable SELinux