diff --git a/charts/ecosystem/templates/api.yaml b/charts/ecosystem/templates/api.yaml
index d8b4ebd..2cd5ed3 100644
--- a/charts/ecosystem/templates/api.yaml
+++ b/charts/ecosystem/templates/api.yaml
@@ -22,7 +22,9 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
diff --git a/charts/ecosystem/templates/couchdb.yaml b/charts/ecosystem/templates/couchdb.yaml
index 9057a71..3b2a26d 100644
--- a/charts/ecosystem/templates/couchdb.yaml
+++ b/charts/ecosystem/templates/couchdb.yaml
@@ -21,7 +21,9 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       containers:
       - name: couchdb
         image: {{ .Values.couchdbImage }}
diff --git a/charts/ecosystem/templates/engine-controller.yaml b/charts/ecosystem/templates/engine-controller.yaml
index ce7f2c6..d9ad566 100644
--- a/charts/ecosystem/templates/engine-controller.yaml
+++ b/charts/ecosystem/templates/engine-controller.yaml
@@ -23,7 +23,9 @@ spec:
       serviceAccountName: galasa
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       containers:
       - name: engine-controller
         image: {{ .Values.galasaRegistry }}/galasa-boot-embedded-{{ .Values.architecture }}:{{ .Values.galasaVersion }}
diff --git a/charts/ecosystem/templates/etcd.yaml b/charts/ecosystem/templates/etcd.yaml
index d49433e..78b76b5 100644
--- a/charts/ecosystem/templates/etcd.yaml
+++ b/charts/ecosystem/templates/etcd.yaml
@@ -21,7 +21,9 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       containers:
       - name: etcd
         image: {{ .Values.etcdImage }}
diff --git a/charts/ecosystem/templates/metrics.yaml b/charts/ecosystem/templates/metrics.yaml
index 0e8e51b..1dd4e9a 100644
--- a/charts/ecosystem/templates/metrics.yaml
+++ b/charts/ecosystem/templates/metrics.yaml
@@ -22,7 +22,9 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       containers:
       - name: metrics
         image: {{ .Values.galasaRegistry }}/galasa-boot-embedded-{{ .Values.architecture }}:{{ .Values.galasaVersion }}
diff --git a/charts/ecosystem/templates/post-setup.yaml b/charts/ecosystem/templates/post-setup.yaml
index 7551487..d19b5d5 100644
--- a/charts/ecosystem/templates/post-setup.yaml
+++ b/charts/ecosystem/templates/post-setup.yaml
@@ -25,7 +25,9 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       restartPolicy: Never
       serviceAccountName: galasa
       containers:
diff --git a/charts/ecosystem/templates/resource-monitor.yaml b/charts/ecosystem/templates/resource-monitor.yaml
index 6aed40f..b35d1ea 100644
--- a/charts/ecosystem/templates/resource-monitor.yaml
+++ b/charts/ecosystem/templates/resource-monitor.yaml
@@ -22,7 +22,9 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       containers:
       - name: resource-monitor
         image: {{ .Values.galasaRegistry }}/galasa-boot-embedded-{{ .Values.architecture }}:{{ .Values.galasaVersion }}
diff --git a/charts/ecosystem/templates/validation.yaml b/charts/ecosystem/templates/validation.yaml
index 8442022..30dfabf 100644
--- a/charts/ecosystem/templates/validation.yaml
+++ b/charts/ecosystem/templates/validation.yaml
@@ -25,7 +25,9 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: {{ .Values.architecture }}
+        {{- if .Values.nodeSelectors }}
 {{ toYaml .Values.nodeSelectors | indent 8 }}
+        {{- end }}
       restartPolicy: Never
       serviceAccountName: galasa
       containers: