diff --git a/config/dev/aws-clusterdeployment.yaml b/config/dev/aws-clusterdeployment.yaml
index e5b37fe8..b4e31a69 100644
--- a/config/dev/aws-clusterdeployment.yaml
+++ b/config/dev/aws-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: aws-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: aws-standalone-cp-0-1-0
+  template: aws-standalone-cp-0-1-2
   credential: aws-cluster-identity-cred
   config:
     clusterLabels: {}
diff --git a/config/dev/azure-clusterdeployment.yaml b/config/dev/azure-clusterdeployment.yaml
index 992b93ad..f28d0262 100644
--- a/config/dev/azure-clusterdeployment.yaml
+++ b/config/dev/azure-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: azure-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: azure-standalone-cp-0-1-0
+  template: azure-standalone-cp-0-1-2
   credential: azure-cluster-identity-cred
   config:
     clusterLabels: {}
diff --git a/config/dev/openstack-clusterdeployment.yaml b/config/dev/openstack-clusterdeployment.yaml
index 02306444..99708e9a 100644
--- a/config/dev/openstack-clusterdeployment.yaml
+++ b/config/dev/openstack-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: openstack-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: openstack-standalone-cp-0-1-1
+  template: openstack-standalone-cp-0-1-3
   credential: openstack-cluster-identity-cred
   config:
     clusterLabels: {}
diff --git a/config/dev/vsphere-clusterdeployment.yaml b/config/dev/vsphere-clusterdeployment.yaml
index 87489489..321e6a79 100644
--- a/config/dev/vsphere-clusterdeployment.yaml
+++ b/config/dev/vsphere-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: vsphere-${CLUSTER_NAME_SUFFIX}
   namespace: ${NAMESPACE}
 spec:
-  template: vsphere-standalone-cp-0-1-0
+  template: vsphere-standalone-cp-0-1-2
   credential: vsphere-cluster-identity-cred
   config:
     clusterLabels: {}
diff --git a/templates/cluster/aws-hosted-cp/Chart.yaml b/templates/cluster/aws-hosted-cp/Chart.yaml
index 2766cc9a..bde43836 100644
--- a/templates/cluster/aws-hosted-cp/Chart.yaml
+++ b/templates/cluster/aws-hosted-cp/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/cluster/aws-hosted-cp/templates/machinedeployment.yaml b/templates/cluster/aws-hosted-cp/templates/machinedeployment.yaml
index f47c0509..f55703bd 100644
--- a/templates/cluster/aws-hosted-cp/templates/machinedeployment.yaml
+++ b/templates/cluster/aws-hosted-cp/templates/machinedeployment.yaml
@@ -2,6 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}
diff --git a/templates/cluster/aws-standalone-cp/Chart.yaml b/templates/cluster/aws-standalone-cp/Chart.yaml
index 281ca28c..bf840667 100644
--- a/templates/cluster/aws-standalone-cp/Chart.yaml
+++ b/templates/cluster/aws-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/cluster/aws-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/aws-standalone-cp/templates/machinedeployment.yaml
index 5c51c104..b2cdbebc 100644
--- a/templates/cluster/aws-standalone-cp/templates/machinedeployment.yaml
+++ b/templates/cluster/aws-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}
diff --git a/templates/cluster/azure-hosted-cp/Chart.yaml b/templates/cluster/azure-hosted-cp/Chart.yaml
index a7f6db06..bcce1805 100644
--- a/templates/cluster/azure-hosted-cp/Chart.yaml
+++ b/templates/cluster/azure-hosted-cp/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/cluster/azure-hosted-cp/templates/machinedeployment.yaml b/templates/cluster/azure-hosted-cp/templates/machinedeployment.yaml
index e5995a1f..3a774033 100644
--- a/templates/cluster/azure-hosted-cp/templates/machinedeployment.yaml
+++ b/templates/cluster/azure-hosted-cp/templates/machinedeployment.yaml
@@ -2,6 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}
diff --git a/templates/cluster/azure-standalone-cp/Chart.yaml b/templates/cluster/azure-standalone-cp/Chart.yaml
index 7ef30314..e68eed65 100644
--- a/templates/cluster/azure-standalone-cp/Chart.yaml
+++ b/templates/cluster/azure-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/cluster/azure-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/azure-standalone-cp/templates/machinedeployment.yaml
index 464ae0ce..0706b7b5 100644
--- a/templates/cluster/azure-standalone-cp/templates/machinedeployment.yaml
+++ b/templates/cluster/azure-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}
diff --git a/templates/cluster/openstack-standalone-cp/Chart.yaml b/templates/cluster/openstack-standalone-cp/Chart.yaml
index 41adad7d..f2604571 100644
--- a/templates/cluster/openstack-standalone-cp/Chart.yaml
+++ b/templates/cluster/openstack-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/cluster/openstack-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/openstack-standalone-cp/templates/machinedeployment.yaml
index 487bca78..ccfccd76 100644
--- a/templates/cluster/openstack-standalone-cp/templates/machinedeployment.yaml
+++ b/templates/cluster/openstack-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}
diff --git a/templates/cluster/vsphere-hosted-cp/Chart.yaml b/templates/cluster/vsphere-hosted-cp/Chart.yaml
index f287eec4..98bbac41 100644
--- a/templates/cluster/vsphere-hosted-cp/Chart.yaml
+++ b/templates/cluster/vsphere-hosted-cp/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/cluster/vsphere-hosted-cp/templates/machinedeployment.yaml b/templates/cluster/vsphere-hosted-cp/templates/machinedeployment.yaml
index 83599c25..786c23ac 100644
--- a/templates/cluster/vsphere-hosted-cp/templates/machinedeployment.yaml
+++ b/templates/cluster/vsphere-hosted-cp/templates/machinedeployment.yaml
@@ -2,6 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}
diff --git a/templates/cluster/vsphere-standalone-cp/Chart.yaml b/templates/cluster/vsphere-standalone-cp/Chart.yaml
index 6446d4c8..b88da7ed 100644
--- a/templates/cluster/vsphere-standalone-cp/Chart.yaml
+++ b/templates/cluster/vsphere-standalone-cp/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/templates/cluster/vsphere-standalone-cp/templates/machinedeployment.yaml b/templates/cluster/vsphere-standalone-cp/templates/machinedeployment.yaml
index 64d8fc8e..bbc62a54 100644
--- a/templates/cluster/vsphere-standalone-cp/templates/machinedeployment.yaml
+++ b/templates/cluster/vsphere-standalone-cp/templates/machinedeployment.yaml
@@ -2,6 +2,8 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
   name: {{ include "machinedeployment.name" . }}
+  annotations:
+    machineset.cluster.x-k8s.io/skip-preflight-checks: "ControlPlaneIsStable"
 spec:
   clusterName: {{ include "cluster.name" . }}
   replicas: {{ .Values.workersNumber }}
diff --git a/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-1.yaml b/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-2.yaml
similarity index 84%
rename from templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-1.yaml
rename to templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-2.yaml
index 34f863f0..af8c2d48 100644
--- a/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-1.yaml
+++ b/templates/provider/kcm-templates/files/templates/aws-hosted-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-hosted-cp-0-1-1
+  name: aws-hosted-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: aws-hosted-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository
diff --git a/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-1.yaml b/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-2.yaml
similarity index 84%
rename from templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-1.yaml
rename to templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-2.yaml
index bcc79c0f..892861cf 100644
--- a/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-1.yaml
+++ b/templates/provider/kcm-templates/files/templates/aws-standalone-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-standalone-cp-0-1-1
+  name: aws-standalone-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: aws-standalone-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository
diff --git a/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-1.yaml b/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-2.yaml
similarity index 84%
rename from templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-1.yaml
rename to templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-2.yaml
index 7a574224..186b87a2 100644
--- a/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-1.yaml
+++ b/templates/provider/kcm-templates/files/templates/azure-hosted-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-hosted-cp-0-1-1
+  name: azure-hosted-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: azure-hosted-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository
diff --git a/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-1.yaml b/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-2.yaml
similarity index 83%
rename from templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-1.yaml
rename to templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-2.yaml
index ac3fd720..da8fc9bc 100644
--- a/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-1.yaml
+++ b/templates/provider/kcm-templates/files/templates/azure-standalone-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-standalone-cp-0-1-1
+  name: azure-standalone-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: azure-standalone-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository
diff --git a/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml b/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml
deleted file mode 100644
index 9c38b397..00000000
--- a/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-2.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: k0rdent.mirantis.com/v1alpha1
-kind: ClusterTemplate
-metadata:
-  name: openstack-standalone-cp-0-1-2
-  annotations:
-    helm.sh/resource-policy: keep
-spec:
-  helm:
-    chartSpec:
-      chart: openstack-standalone-cp
-      version: 0.1.2
-      interval: 10m0s
-      sourceRef:
-        kind: HelmRepository
-        name: kcm-templates
diff --git a/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-1.yaml b/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-3.yaml
similarity index 82%
rename from templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-1.yaml
rename to templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-3.yaml
index 7bf00702..04d7bff5 100644
--- a/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-1.yaml
+++ b/templates/provider/kcm-templates/files/templates/openstack-standalone-cp-0-1-3.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: openstack-standalone-cp-0-1-1
+  name: openstack-standalone-cp-0-1-3
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: openstack-standalone-cp
-      version: 0.1.1
+      version: 0.1.3
       interval: 10m0s
       sourceRef:
         kind: HelmRepository
diff --git a/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-1.yaml b/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-2.yaml
similarity index 84%
rename from templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-1.yaml
rename to templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-2.yaml
index 48406d53..49eae1db 100644
--- a/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-1.yaml
+++ b/templates/provider/kcm-templates/files/templates/vsphere-hosted-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: vsphere-hosted-cp-0-1-1
+  name: vsphere-hosted-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: vsphere-hosted-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository
diff --git a/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-1.yaml b/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-2.yaml
similarity index 83%
rename from templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-1.yaml
rename to templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-2.yaml
index f4869015..f9e1a138 100644
--- a/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-1.yaml
+++ b/templates/provider/kcm-templates/files/templates/vsphere-standalone-cp-0-1-2.yaml
@@ -1,14 +1,14 @@
 apiVersion: k0rdent.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: vsphere-standalone-cp-0-1-1
+  name: vsphere-standalone-cp-0-1-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: vsphere-standalone-cp
-      version: 0.1.1
+      version: 0.1.2
       interval: 10m0s
       sourceRef:
         kind: HelmRepository