diff --git a/README.md b/README.md
index 987d7566f..1336d5bf3 100644
--- a/README.md
+++ b/README.md
@@ -217,7 +217,7 @@ spec:
       iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io
       instanceType: ""
     workersNumber: 2
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: aws-credential
   dryRun: true
 ```
@@ -235,7 +235,7 @@ metadata:
   name: aws-standalone
   namespace: hmc-system
 spec:
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: aws-credential
   config:
     region: us-east-2
diff --git a/config/dev/aws-managedcluster.yaml b/config/dev/aws-managedcluster.yaml
index 0458923dc..e0eaa9502 100644
--- a/config/dev/aws-managedcluster.yaml
+++ b/config/dev/aws-managedcluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: aws-dev
   namespace: ${NAMESPACE}
 spec:
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: aws-cluster-identity-cred
   config:
     controlPlane:
diff --git a/config/dev/azure-managedcluster.yaml b/config/dev/azure-managedcluster.yaml
index 830b47553..65b8aad11 100644
--- a/config/dev/azure-managedcluster.yaml
+++ b/config/dev/azure-managedcluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: azure-dev
   namespace: ${NAMESPACE}
 spec:
-  template: azure-standalone-cp-0-0-3
+  template: azure-standalone-cp-0-0-4
   credential: azure-cluster-identity-cred
   config:
     controlPlaneNumber: 1
diff --git a/templates/cluster/aws-standalone-cp/Chart.yaml b/templates/cluster/aws-standalone-cp/Chart.yaml
index 7fadaf8b8..afa49eca0 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.0.3
+version: 0.0.4
 # 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/awscluster.yaml b/templates/cluster/aws-standalone-cp/templates/awscluster.yaml
index 7b098d678..6ff2f3e51 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/azure-standalone-cp/Chart.yaml b/templates/cluster/azure-standalone-cp/Chart.yaml
index 786a464b3..12e00f8bc 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.0.3
+version: 0.0.4
 # 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/azurecluster.yaml b/templates/cluster/azure-standalone-cp/templates/azurecluster.yaml
index bb940f8cc..7677e22cd 100644
--- a/templates/cluster/azure-standalone-cp/templates/azurecluster.yaml
+++ b/templates/cluster/azure-standalone-cp/templates/azurecluster.yaml
@@ -2,6 +2,8 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AzureCluster
 metadata:
   name: {{ include "cluster.name" . }}
+  finalizers:
+    - hmc.mirantis.com/cleanup
 spec:
   {{- with .Values.clusterIdentity }}
   identityRef:
diff --git a/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-3.yaml b/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-4.yaml
similarity index 74%
rename from templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-3.yaml
rename to templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-4.yaml
index 9b1f98f2f..ecc205966 100644
--- a/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-3.yaml
+++ b/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-4.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-standalone-cp-0-0-3
+  name: aws-standalone-cp-0-0-4
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: aws-standalone-cp
-    chartVersion: 0.0.3
+    chartVersion: 0.0.4
diff --git a/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-3.yaml b/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-4.yaml
similarity index 74%
rename from templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-3.yaml
rename to templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-4.yaml
index 8b867c342..0b87266a0 100644
--- a/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-3.yaml
+++ b/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-4.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-standalone-cp-0-0-3
+  name: azure-standalone-cp-0-0-4
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: azure-standalone-cp
-    chartVersion: 0.0.3
+    chartVersion: 0.0.4
diff --git a/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
index 24c449bc0..7f49cb388 100644
--- a/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
+++ b/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
@@ -3,7 +3,7 @@ kind: ManagedCluster
 metadata:
   name: ${MANAGED_CLUSTER_NAME}
 spec:
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: ${AWS_CLUSTER_IDENTITY}-cred
   config:
     clusterIdentity:
diff --git a/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl
index 3894b7b39..4b68cd4c9 100644
--- a/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl
+++ b/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl
@@ -4,7 +4,7 @@ metadata:
   name: ${MANAGED_CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
-  template: azure-standalone-cp-0-0-3
+  template: azure-standalone-cp-0-0-4
   credential: ${AZURE_CLUSTER_IDENTITY}-cred
   config:
     controlPlaneNumber: 1