diff --git a/tasks/control-plane-aux-setup.yml b/tasks/control-plane-aux-setup.yml
index 861f397..bed01c2 100644
--- a/tasks/control-plane-aux-setup.yml
+++ b/tasks/control-plane-aux-setup.yml
@@ -9,7 +9,13 @@
 - name: Allow pods on control plane (if configured).
   command: "kubectl taint nodes {{ inventory_hostname_short }} node-role.kubernetes.io/control-plane-"
   register: taint_removed
-  changed_when: "'removed' in taint_removed.stdout"
+  until: >
+    ("untainted" in taint_removed.stdout) or
+    ("not found" in taint_removed.stdout)
+  changed_when: "'untainted' in taint_removed.stdout"
+  failed_when: false
+  retries: 100
+  delay: 5
   when:
     - kubernetes_allow_pods_on_control_plane | bool
     - join_ctrl_plane.changed