diff --git a/roles/rke2/tasks/fix_selinux.yml b/roles/rke2/tasks/fix_selinux.yml
index 5dc3e1b46416f1ddb078e05591191ca8b118b32d..476791f15ada137cf245cf5cbbad627b3f8753e3 100644
--- a/roles/rke2/tasks/fix_selinux.yml
+++ b/roles/rke2/tasks/fix_selinux.yml
@@ -6,19 +6,29 @@
 - name: Update CA trust
   shell: update-ca-trust
 
-- 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
-  when: ( 'master' in group_names and not upgrade)
-  ignore_errors: True
-
+#- 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
+#  when: ( 'master' in group_names and not upgrade)
+#  ignore_errors: True
 
 - 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=120s"
+  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=60s"
   register: openstack_ccm_ready
-  when: not upgrade
+  when: ('master' in group_names)
   ignore_errors: True
 
+
+- debug: var=openstack_ccm_ready.stdout_lines
+#- name: Wait for openstack-cloud-controller deamon set to be ready
+#  shell: " sleep 60"
+  
+#- 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=120s"
+#  register: openstack_ccm_ready
+#  when: not upgrade
+#  ignore_errors: True
+
 - name: Enable SELinux
   selinux:
     policy: targeted
diff --git a/roles/rke2/tasks/main.yml b/roles/rke2/tasks/main.yml
index 7434cedaf6a878e099de66fdc4d3ffed47343e41..f65e0c7992943f102eea7bdc36f00948ba9fb62b 100644
--- a/roles/rke2/tasks/main.yml
+++ b/roles/rke2/tasks/main.yml
@@ -6,7 +6,7 @@
 - block:
   - include_tasks: setup_host.yml
   - include_tasks: install_rke2.yml
-  when: ( not rke2_installed.stat.exists and state != 'absent' ) or (upgrade and state != 'absent' )
+ # when: ( not rke2_installed.stat.exists and state != 'absent' ) or (upgrade and state != 'absent' )
 
 - include_tasks: templates.yml
   when: "state != 'absent' and 'master' in group_names  "
@@ -22,7 +22,7 @@
 # Flush the handlers only for fresh installs
 - name: Flush handlers
   meta: flush_handlers
-  when: ( not rke2_installed.stat.exists and state != 'absent' )s
+
   
 #This task runs only after the full installer went through and had a bit of time to boot, then starts to enforce SELinux
 - include_tasks: fix_selinux.yml