diff --git a/charts/templates/cluster.yaml b/charts/templates/cluster.yaml
index fc646e3..b879c7c 100644
--- a/charts/templates/cluster.yaml
+++ b/charts/templates/cluster.yaml
@@ -43,7 +43,7 @@ spec:
         {{- else if eq $.Values.cloudprovider "azure" }}
         kind: AzureConfig
         {{- end}}
-        name: {{ $nodepool.name }}
+        name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
       paused: {{ $nodepool.paused }}
       displayName: {{ $nodepool.displayName }}
       {{- if $nodepool.rollingUpdate }}
@@ -80,7 +80,7 @@ spec:
         {{- else if eq $.Values.cloudprovider "azure" }}
         kind: AzureConfig
         {{- end}}
-        name: {{ $nodepool.name }}
+        name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
       paused: {{ $nodepool.paused }}
       displayName: {{ $nodepool.displayName }}
       {{- if $nodepool.rollingUpdate }}
diff --git a/charts/templates/nodeconfig-aws.yaml b/charts/templates/nodeconfig-aws.yaml
index 77d575c..8c431ff 100644
--- a/charts/templates/nodeconfig-aws.yaml
+++ b/charts/templates/nodeconfig-aws.yaml
@@ -3,7 +3,7 @@
 apiVersion: rke-machine-config.cattle.io/v1
 kind: Amazonec2Config
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 {{- if $nodepool.ami }}
 ami: {{ $nodepool.ami }}
@@ -45,7 +45,7 @@ keypairName: {{ $nodepool.keypairName }}
 monitoring: {{ $nodepool.monitoring }}
 {{- end }}
 {{- if $nodepool.openPort}}
-openPort: 
+openPort:
 {{- range $i, $port := $nodepool.openPort }}
 - {{ $port }}
 {{- end }}
@@ -117,7 +117,7 @@ zone: {{ $nodepool.zone }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: Amazonec2Config
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 {{- if $nodepool.ami }}
 ami: {{ $nodepool.ami }}
@@ -159,7 +159,7 @@ keypairName: {{ $nodepool.keypairName }}
 monitoring: {{ $nodepool.monitoring }}
 {{- end }}
 {{- if $nodepool.openPort}}
-openPort: 
+openPort:
 {{- range $i, $port := $nodepool.openPort }}
 - {{ $port }}
 {{- end }}
diff --git a/charts/templates/nodeconfig-azure.yaml b/charts/templates/nodeconfig-azure.yaml
index 2e719ff..12735ec 100644
--- a/charts/templates/nodeconfig-azure.yaml
+++ b/charts/templates/nodeconfig-azure.yaml
@@ -3,7 +3,7 @@
 apiVersion: rke-machine-config.cattle.io/v1
 kind: AzureConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
@@ -26,7 +26,7 @@ location: {{ $nodepool.location }}
 managedDisks: {{ $nodepool.managedDisks }}
 noPublicIp: {{ $nodepool.noPublicIp }}
 {{- if $nodepool.openPort}}
-openPort: 
+openPort:
 {{- range $i, $port := $nodepool.openPort }}
 - {{ $port }}
 {{- end }}
@@ -50,7 +50,7 @@ vnet: {{ $nodepool.vnet }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: AzureConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
@@ -73,7 +73,7 @@ location: {{ $nodepool.location }}
 managedDisks: {{ $nodepool.managedDisks }}
 noPublicIp: {{ $nodepool.noPublicIp }}
 {{- if $nodepool.openPort}}
-openPort: 
+openPort:
 {{- range $i, $port := $nodepool.openPort }}
 - {{ $port }}
 {{- end }}
diff --git a/charts/templates/nodeconfig-do.yaml b/charts/templates/nodeconfig-do.yaml
index 0a38fea..c996f07 100644
--- a/charts/templates/nodeconfig-do.yaml
+++ b/charts/templates/nodeconfig-do.yaml
@@ -3,7 +3,7 @@
 apiVersion: rke-machine-config.cattle.io/v1
 kind: DigitaloceanConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
@@ -34,7 +34,7 @@ userdata: {{ $nodepool.userdata }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: DigitaloceanConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
diff --git a/charts/templates/nodeconfig-harvester.yaml b/charts/templates/nodeconfig-harvester.yaml
index 64baf13..02d1d93 100644
--- a/charts/templates/nodeconfig-harvester.yaml
+++ b/charts/templates/nodeconfig-harvester.yaml
@@ -3,7 +3,7 @@
 apiVersion: rke-machine-config.cattle.io/v1
 kind: HarvesterConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
@@ -29,7 +29,7 @@ sshUser: {{ $nodepool.sshUser }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: HarvesterConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
diff --git a/charts/templates/nodeconfig-vsphere.yaml b/charts/templates/nodeconfig-vsphere.yaml
index ca2e5ab..8a2c391 100644
--- a/charts/templates/nodeconfig-vsphere.yaml
+++ b/charts/templates/nodeconfig-vsphere.yaml
@@ -3,7 +3,7 @@
 apiVersion: rke-machine-config.cattle.io/v1
 kind: VmwarevsphereConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}
@@ -50,7 +50,7 @@ vcenterPort: {{ $nodepool.vcenterPort }}
 apiVersion: rke-machine-config.cattle.io/v1
 kind: VmwarevsphereConfig
 metadata:
-  name: {{ $nodepool.name }}
+  name: {{ $.Values.cluster.name }}-{{ $nodepool.name }}
   namespace: fleet-default
 common:
 {{- if $nodepool.labels }}