diff --git a/ansible/roles/kubernetes_control_plane/tasks/main.yaml b/ansible/roles/kubernetes_control_plane/tasks/main.yaml
index df82f64..7a1512e 100644
--- a/ansible/roles/kubernetes_control_plane/tasks/main.yaml
+++ b/ansible/roles/kubernetes_control_plane/tasks/main.yaml
@@ -49,6 +49,9 @@
   args:
     creates: $HOME/.kube/config
 
+- name: Untaint control planes
+  ansible.builtin.import_tasks: untaint.yaml
+
 - name: Install Kubernetes CLI
   ansible.builtin.apt:
     pkg:
diff --git a/ansible/roles/kubernetes_control_plane/tasks/untaint.yaml b/ansible/roles/kubernetes_control_plane/tasks/untaint.yaml
new file mode 100644
index 0000000..3cd04be
--- /dev/null
+++ b/ansible/roles/kubernetes_control_plane/tasks/untaint.yaml
@@ -0,0 +1,7 @@
+- name: Remove control plane NoSchedule taint from all nodes
+  kubernetes.core.k8s_taint:
+    state: absent
+    name: "{{ inventory_hostname_short }}"
+    taints:
+      - key: node-role.kubernetes.io/control-plane
+        effect: NoSchedule