diff --git a/config/dev/aws-managedcluster.yaml b/config/dev/aws-managedcluster.yaml
index dd303141c..6400d55d3 100644
--- a/config/dev/aws-managedcluster.yaml
+++ b/config/dev/aws-managedcluster.yaml
@@ -18,7 +18,7 @@ spec:
       instanceType: t3.small
     workersNumber: 1
     installBeachHeadServices: false
-  template: aws-standalone-cp-0-0-1
+  template: aws-standalone-cp-0-0-2
   services:
     - template: kyverno-3-2-6
       name: kyverno
diff --git a/config/dev/azure-managedcluster.yaml b/config/dev/azure-managedcluster.yaml
index 4dfab5e69..d0e563797 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-1
+  template: azure-standalone-cp-0-0-2
   credential: azure-cluster-identity-cred
   config:
     controlPlaneNumber: 1
diff --git a/config/dev/eks-managedcluster.yaml b/config/dev/eks-managedcluster.yaml
index a6731163a..b4d8f995e 100644
--- a/config/dev/eks-managedcluster.yaml
+++ b/config/dev/eks-managedcluster.yaml
@@ -7,5 +7,5 @@ spec:
   config:
     region: us-east-2
     workersNumber: 1
-  template: aws-eks-0-0-1
+  template: aws-eks-0-0-2
   credential: "aws-cluster-identity-cred"
diff --git a/config/dev/vsphere-managedcluster.yaml b/config/dev/vsphere-managedcluster.yaml
index c9daaf311..2fbd81f37 100644
--- a/config/dev/vsphere-managedcluster.yaml
+++ b/config/dev/vsphere-managedcluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: vsphere-dev
   namespace: ${NAMESPACE}
 spec:
-  template: vsphere-standalone-cp-0-0-1
+  template: vsphere-standalone-cp-0-0-2
   credential: vsphere-cluster-identity-cred
   config:
     controlPlaneNumber: 1
diff --git a/templates/cluster/aws-hosted-cp/Chart.yaml b/templates/cluster/aws-hosted-cp/Chart.yaml
index f6cc01a41..64f6d8f68 100644
--- a/templates/cluster/aws-hosted-cp/Chart.yaml
+++ b/templates/cluster/aws-hosted-cp/Chart.yaml
@@ -7,12 +7,12 @@ 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.1
+version: 0.0.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.
 # It is recommended to use it with quotes.
-appVersion: "1.30.4+k0s.0"
+appVersion: "v1.31.1+k0s.1"
 annotations:
   hmc.mirantis.com/infrastructure-providers: aws
   hmc.mirantis.com/control-plane-providers: k0smotron
diff --git a/templates/cluster/aws-hosted-cp/values.yaml b/templates/cluster/aws-hosted-cp/values.yaml
index 4949d631b..c19e244b7 100644
--- a/templates/cluster/aws-hosted-cp/values.yaml
+++ b/templates/cluster/aws-hosted-cp/values.yaml
@@ -46,4 +46,4 @@ k0smotron:
 
 # K0s parameters
 k0s:
-  version: v1.30.4+k0s.0
+  version: v1.31.1+k0s.1
diff --git a/templates/cluster/aws-standalone-cp/Chart.yaml b/templates/cluster/aws-standalone-cp/Chart.yaml
index 0ec9d2967..01f0fcada 100644
--- a/templates/cluster/aws-standalone-cp/Chart.yaml
+++ b/templates/cluster/aws-standalone-cp/Chart.yaml
@@ -6,12 +6,12 @@ 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.1
+version: 0.0.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.
 # It is recommended to use it with quotes.
-appVersion: "1.30.4+k0s.0"
+appVersion: "v1.31.1+k0s.1"
 annotations:
   hmc.mirantis.com/infrastructure-providers: aws
   hmc.mirantis.com/control-plane-providers: k0s
diff --git a/templates/cluster/aws-standalone-cp/values.yaml b/templates/cluster/aws-standalone-cp/values.yaml
index fd0d52ae0..13499710a 100644
--- a/templates/cluster/aws-standalone-cp/values.yaml
+++ b/templates/cluster/aws-standalone-cp/values.yaml
@@ -46,4 +46,4 @@ worker:
 
 # K0s parameters
 k0s:
-  version: v1.30.4+k0s.0
\ No newline at end of file
+  version: v1.31.1+k0s.1
diff --git a/templates/cluster/azure-hosted-cp/Chart.yaml b/templates/cluster/azure-hosted-cp/Chart.yaml
index e12c1b4bb..1a614b992 100644
--- a/templates/cluster/azure-hosted-cp/Chart.yaml
+++ b/templates/cluster/azure-hosted-cp/Chart.yaml
@@ -7,12 +7,12 @@ 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.1
+version: 0.0.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.
 # It is recommended to use it with quotes.
-appVersion: "1.30.4+k0s.0"
+appVersion: "v1.31.1+k0s.1"
 annotations:
   hmc.mirantis.com/infrastructure-providers: azure
   hmc.mirantis.com/control-plane-providers: k0s
diff --git a/templates/cluster/azure-hosted-cp/values.yaml b/templates/cluster/azure-hosted-cp/values.yaml
index 3440db477..79aa4929a 100644
--- a/templates/cluster/azure-hosted-cp/values.yaml
+++ b/templates/cluster/azure-hosted-cp/values.yaml
@@ -47,4 +47,4 @@ k0smotron:
 
 # K0s parameters
 k0s:
-  version: v1.30.4+k0s.0
+  version: v1.31.1+k0s.1
diff --git a/templates/cluster/azure-standalone-cp/Chart.yaml b/templates/cluster/azure-standalone-cp/Chart.yaml
index aaa1cc10e..16c716767 100644
--- a/templates/cluster/azure-standalone-cp/Chart.yaml
+++ b/templates/cluster/azure-standalone-cp/Chart.yaml
@@ -6,12 +6,12 @@ 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.1
+version: 0.0.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.
 # It is recommended to use it with quotes.
-appVersion: "1.30.4+k0s.0"
+appVersion: "1.31.1+k0s.1"
 annotations:
   hmc.mirantis.com/infrastructure-providers: azure
   hmc.mirantis.com/control-plane-providers: k0s
diff --git a/templates/cluster/azure-standalone-cp/values.yaml b/templates/cluster/azure-standalone-cp/values.yaml
index 9b9bb0520..801889805 100644
--- a/templates/cluster/azure-standalone-cp/values.yaml
+++ b/templates/cluster/azure-standalone-cp/values.yaml
@@ -45,4 +45,4 @@ worker:
 
 # K0s parameters
 k0s:
-  version: v1.30.4+k0s.0
+  version: v1.31.1+k0s.1
diff --git a/templates/cluster/vsphere-hosted-cp/Chart.yaml b/templates/cluster/vsphere-hosted-cp/Chart.yaml
index 4619a40e9..63c943e5e 100644
--- a/templates/cluster/vsphere-hosted-cp/Chart.yaml
+++ b/templates/cluster/vsphere-hosted-cp/Chart.yaml
@@ -7,12 +7,12 @@ 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.1
+version: 0.0.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.
 # It is recommended to use it with quotes.
-appVersion: "1.30.4+k0s.0"
+appVersion: "v1.31.1+k0s.1"
 annotations:
   hmc.mirantis.com/type: deployment
   hmc.mirantis.com/infrastructure-providers: vsphere
diff --git a/templates/cluster/vsphere-hosted-cp/values.yaml b/templates/cluster/vsphere-hosted-cp/values.yaml
index ca9334205..94c91bef4 100644
--- a/templates/cluster/vsphere-hosted-cp/values.yaml
+++ b/templates/cluster/vsphere-hosted-cp/values.yaml
@@ -34,10 +34,6 @@ memory: 4096
 vmTemplate: ""
 network: ""
 
-# K0s parameters
-k0s:
-  version: v1.30.4+k0s.0
-
 # K0smotron parameters
 k0smotron:
   service:
@@ -47,4 +43,4 @@ k0smotron:
 
 # K0s parameters
 k0s:
-  version: v1.30.4+k0s.0
+  version: v1.31.1+k0s.1
diff --git a/templates/cluster/vsphere-standalone-cp/Chart.yaml b/templates/cluster/vsphere-standalone-cp/Chart.yaml
index 23f270373..c96eadd20 100644
--- a/templates/cluster/vsphere-standalone-cp/Chart.yaml
+++ b/templates/cluster/vsphere-standalone-cp/Chart.yaml
@@ -6,12 +6,12 @@ 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.1
+version: 0.0.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.
 # It is recommended to use it with quotes.
-appVersion: "1.30.4+k0s.0"
+appVersion: "v1.31.1+k0s.1"
 annotations:
   hmc.mirantis.com/type: deployment
   hmc.mirantis.com/infrastructure-providers: vsphere
diff --git a/templates/cluster/vsphere-standalone-cp/values.yaml b/templates/cluster/vsphere-standalone-cp/values.yaml
index 71415b7d1..0ee9c2d3d 100644
--- a/templates/cluster/vsphere-standalone-cp/values.yaml
+++ b/templates/cluster/vsphere-standalone-cp/values.yaml
@@ -47,4 +47,4 @@ worker:
 
 # K0s parameters
 k0s:
-  version: v1.30.4+k0s.0
+  version: v1.31.1+k0s.1
diff --git a/templates/provider/hmc-templates/files/templates/aws-hosted-cp-0-0-1.yaml b/templates/provider/hmc-templates/files/templates/aws-hosted-cp-0-0-2.yaml
similarity index 75%
rename from templates/provider/hmc-templates/files/templates/aws-hosted-cp-0-0-1.yaml
rename to templates/provider/hmc-templates/files/templates/aws-hosted-cp-0-0-2.yaml
index 0e45d5f19..11503b2a1 100644
--- a/templates/provider/hmc-templates/files/templates/aws-hosted-cp-0-0-1.yaml
+++ b/templates/provider/hmc-templates/files/templates/aws-hosted-cp-0-0-2.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-hosted-cp-0-0-1
+  name: aws-hosted-cp-0-0-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: aws-hosted-cp
-    chartVersion: 0.0.1
+    chartVersion: 0.0.2
diff --git a/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-1.yaml b/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-2.yaml
similarity index 74%
rename from templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-1.yaml
rename to templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-2.yaml
index 4b9cf71c9..116b2f4eb 100644
--- a/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-1.yaml
+++ b/templates/provider/hmc-templates/files/templates/aws-standalone-cp-0-0-2.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-standalone-cp-0-0-1
+  name: aws-standalone-cp-0-0-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: aws-standalone-cp
-    chartVersion: 0.0.1
+    chartVersion: 0.0.2
diff --git a/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-1.yaml b/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-2.yaml
similarity index 75%
rename from templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-1.yaml
rename to templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-2.yaml
index 09444efb5..dd7570c10 100644
--- a/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-1.yaml
+++ b/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-2.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-hosted-cp-0-0-1
+  name: azure-hosted-cp-0-0-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: azure-hosted-cp
-    chartVersion: 0.0.1
+    chartVersion: 0.0.2
diff --git a/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-1.yaml b/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-2.yaml
similarity index 74%
rename from templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-1.yaml
rename to templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-2.yaml
index a3400be17..d07a5d866 100644
--- a/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-1.yaml
+++ b/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-2.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-standalone-cp-0-0-1
+  name: azure-standalone-cp-0-0-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: azure-standalone-cp
-    chartVersion: 0.0.1
+    chartVersion: 0.0.2
diff --git a/templates/provider/hmc-templates/files/templates/vsphere-hosted-cp-0-0-1.yaml b/templates/provider/hmc-templates/files/templates/vsphere-hosted-cp-0-0-2.yaml
similarity index 74%
rename from templates/provider/hmc-templates/files/templates/vsphere-hosted-cp-0-0-1.yaml
rename to templates/provider/hmc-templates/files/templates/vsphere-hosted-cp-0-0-2.yaml
index 65e39e5ce..327a7c2c5 100644
--- a/templates/provider/hmc-templates/files/templates/vsphere-hosted-cp-0-0-1.yaml
+++ b/templates/provider/hmc-templates/files/templates/vsphere-hosted-cp-0-0-2.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: vsphere-hosted-cp-0-0-1
+  name: vsphere-hosted-cp-0-0-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: vsphere-hosted-cp
-    chartVersion: 0.0.1
+    chartVersion: 0.0.2
diff --git a/templates/provider/hmc-templates/files/templates/vsphere-standalone-cp-0-0-1.yaml b/templates/provider/hmc-templates/files/templates/vsphere-standalone-cp-0-0-2.yaml
similarity index 73%
rename from templates/provider/hmc-templates/files/templates/vsphere-standalone-cp-0-0-1.yaml
rename to templates/provider/hmc-templates/files/templates/vsphere-standalone-cp-0-0-2.yaml
index 901cb2aab..0bb171972 100644
--- a/templates/provider/hmc-templates/files/templates/vsphere-standalone-cp-0-0-1.yaml
+++ b/templates/provider/hmc-templates/files/templates/vsphere-standalone-cp-0-0-2.yaml
@@ -1,10 +1,10 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: vsphere-standalone-cp-0-0-1
+  name: vsphere-standalone-cp-0-0-2
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartName: vsphere-standalone-cp
-    chartVersion: 0.0.1
+    chartVersion: 0.0.2
diff --git a/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl
index 072ab3abd..b8758c9ab 100644
--- a/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl
+++ b/test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl
@@ -3,7 +3,7 @@ kind: ManagedCluster
 metadata:
   name: ${MANAGED_CLUSTER_NAME}
 spec:
-  template: aws-hosted-cp-0-0-1
+  template: aws-hosted-cp-0-0-2
   credential: ${AWS_CLUSTER_IDENTITY}-cred
   config:
     clusterIdentity:
diff --git a/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
index f2081b755..8d2ceab31 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-1
+  template: aws-standalone-cp-0-0-2
   credential: ${AWS_CLUSTER_IDENTITY}-cred
   config:
     clusterIdentity:
@@ -17,5 +17,3 @@ spec:
       instanceType: ${AWS_INSTANCE_TYPE:=t3.small}
     worker:
       instanceType: ${AWS_INSTANCE_TYPE:=t3.small}
-
-
diff --git a/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl
index c28f703da..7cbe61b71 100644
--- a/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl
+++ b/test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl
@@ -4,7 +4,7 @@ metadata:
   name: ${MANAGED_CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
-  template: azure-hosted-cp-0-0-1
+  template: azure-hosted-cp-0-0-2
   credential: ${AZURE_CLUSTER_IDENTITY}-cred
   config:
     location: "${AZURE_REGION}"
diff --git a/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl
index 5906d4f2b..7f1083a83 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-1
+  template: azure-standalone-cp-0-0-2
   credential: ${AZURE_CLUSTER_IDENTITY}-cred
   config:
     controlPlaneNumber: 1
diff --git a/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl b/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl
index c524f010b..03a201cce 100644
--- a/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl
+++ b/test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl
@@ -3,7 +3,7 @@ kind: ManagedCluster
 metadata:
   name: ${MANAGED_CLUSTER_NAME}
 spec:
-  template: vsphere-hosted-cp-0-0-1
+  template: vsphere-hosted-cp-0-0-2
   credential: ${VSPHERE_CLUSTER_IDENTITY}-cred
   config:
     controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
diff --git a/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl
index 1981fe8e8..47c7dc538 100644
--- a/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl
+++ b/test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl
@@ -3,7 +3,7 @@ kind: ManagedCluster
 metadata:
   name: ${MANAGED_CLUSTER_NAME}
 spec:
-  template: vsphere-standalone-cp-0-0-1
+  template: vsphere-standalone-cp-0-0-2
   credential: ${VSPHERE_CLUSTER_IDENTITY}-cred
   config:
     controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}