diff --git a/charts/templates/cluster.yaml b/charts/templates/cluster.yaml
index 55d069f..a27417c 100644
--- a/charts/templates/cluster.yaml
+++ b/charts/templates/cluster.yaml
@@ -57,6 +57,14 @@ spec:
         maxUnavailable: {{ $nodepool.rollingUpdate.maxUnavailable }}
         maxSurge: {{ $nodepool.rollingUpdate.maxSurge }}
       {{- end }}
+      {{- if $nodepool.labels }}
+      labels:
+{{ toYaml $nodepool.labels | indent 8 }}
+      {{- end }}
+      {{- if $nodepool.taints }}
+      taints:
+{{ toYaml $nodepool.taints | indent 8 }}
+      {{- end }}
       {{- if $nodepool.machineDeploymentLabels }}
       machineDeploymentLabels:
 {{ toYaml $nodepool.machineDeploymentLabels | indent 8 }}
@@ -94,6 +102,14 @@ spec:
         maxUnavailable: {{ $nodepool.rollingUpdate.maxUnavailable }}
         maxSurge: {{ $nodepool.rollingUpdate.maxSurge }}
       {{- end }}
+      {{- if $nodepool.labels }}
+      labels:
+{{ toYaml $nodepool.labels | indent 8 }}
+      {{- end }}
+      {{- if $nodepool.taints }}
+      taints:
+{{ toYaml $nodepool.taints | indent 8 }}
+      {{- end }}
       {{- if $nodepool.machineDeploymentLabels }}
       machineDeploymentLabels:
 {{ toYaml $nodepool.machineDeploymentLabels | indent 8 }}
diff --git a/charts/templates/nodeconfig-aws.yaml b/charts/templates/nodeconfig-aws.yaml
index 77d575c..7cafb06 100644
--- a/charts/templates/nodeconfig-aws.yaml
+++ b/charts/templates/nodeconfig-aws.yaml
@@ -14,15 +14,6 @@ blockDurationMinutes: {{ $nodepool.blockDurationMinutes }}
 {{- if $nodepool.deviceName }}
 deviceName: {{ $nodepool.deviceName }}
 {{- end }}
-common:
-{{- if $nodepool.labels }}
-  labels:
-{{ toYaml $nodepool.labels | indent 4 }}
-{{- end }}
-{{- if $nodepool.taints }}
-  taints:
-{{ toYaml $nodepool.taints | indent 4 }}
-{{- end }}
 {{- if $nodepool.encryptEbsVolume }}
 encryptEbsVolume: {{ $nodepool.encryptEbsVolume }}
 {{- end }}
@@ -128,15 +119,6 @@ blockDurationMinutes: {{ $nodepool.blockDurationMinutes }}
 {{- if $nodepool.deviceName }}
 deviceName: {{ $nodepool.deviceName }}
 {{- end }}
-common:
-{{- if $nodepool.labels }}
-  labels:
-{{ toYaml $nodepool.labels | indent 4 }}
-{{- end }}
-{{- if $nodepool.taints }}
-  taints:
-{{ toYaml $nodepool.taints | indent 4 }}
-{{- end }}
 {{- if $nodepool.encryptEbsVolume }}
 encryptEbsVolume: {{ $nodepool.encryptEbsVolume }}
 {{- end }}