diff --git a/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml b/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml
index 5fb372752..688e86cef 100644
--- a/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml
+++ b/templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml
@@ -57,3 +57,4 @@ spec:
                 enabled: true
               node:
                 kubeletPath: /var/lib/k0s/kubelet
+                tolerateAllTaints: true
diff --git a/templates/cluster/aws-standalone-cp/templates/awscluster.yaml b/templates/cluster/aws-standalone-cp/templates/awscluster.yaml
index c199c7227..b2ccc6a12 100644
--- a/templates/cluster/aws-standalone-cp/templates/awscluster.yaml
+++ b/templates/cluster/aws-standalone-cp/templates/awscluster.yaml
@@ -4,6 +4,8 @@ metadata:
   name: {{ include "cluster.name" . }}
   annotations:
     aws.cluster.x-k8s.io/external-resource-gc: "true"
+  finalizers:
+  - hmc.mirantis.com/cleanup
 spec:
   region: {{ .Values.region }}
   # identityRef:
diff --git a/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml b/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml
index 8d17a3497..1240daaa7 100644
--- a/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml
+++ b/templates/cluster/aws-standalone-cp/templates/k0scontrolplane.yaml
@@ -56,6 +56,7 @@ spec:
                     enabled: true
                   node:
                     kubeletPath: /var/lib/k0s/kubelet
+                    tolerateAllTaints: true
   machineTemplate:
     infrastructureRef:
       apiVersion: infrastructure.cluster.x-k8s.io/v1beta2