diff --git a/templates/cronjob-media-remove.yaml b/templates/cronjob-media-remove.yaml
index 13a520f..873fda0 100644
--- a/templates/cronjob-media-remove.yaml
+++ b/templates/cronjob-media-remove.yaml
@@ -109,9 +109,9 @@ spec:
               {{- end }}
           {{- if .Values.mastodon.cron.removeMedia.nodeSelector }}
           nodeSelector:
-            {{ .Values.mastodon.cron.removeMedia.nodeSelector | toYaml | nindent 12 }}
+            {{- .Values.mastodon.cron.removeMedia.nodeSelector | toYaml | nindent 12 }}
           {{- else if .Values.nodeSelector }}
           nodeSelector:
-            {{ .Values.nodeSelector | toYaml | nindent 12 }}
+            {{- .Values.nodeSelector | toYaml | nindent 12 }}
           {{- end }}
 {{- end }}
diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml
index aa8a69b..3ddcced 100644
--- a/templates/deployment-streaming.yaml
+++ b/templates/deployment-streaming.yaml
@@ -163,10 +163,10 @@ spec:
           {{- end }}
       {{- if .Values.mastodon.streaming.nodeSelector }}
       nodeSelector:
-        {{ .Values.mastodon.streaming.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.mastodon.streaming.nodeSelector | toYaml | nindent 8 }}
       {{- else if .Values.nodeSelector }}
       nodeSelector:
-        {{ .Values.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.nodeSelector | toYaml | nindent 8 }}
       {{- end }}
       {{- with (default .Values.affinity .Values.mastodon.streaming.affinity) }}
       affinity:
diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
index 7a9b9da..4949c1c 100644
--- a/templates/deployment-web.yaml
+++ b/templates/deployment-web.yaml
@@ -271,10 +271,10 @@ spec:
         {{- include "mastodon.statsdExporterContainer" $ | indent 8 }}
       {{- if .Values.mastodon.web.nodeSelector }}
       nodeSelector:
-        {{ .Values.mastodon.web.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.mastodon.web.nodeSelector | toYaml | nindent 8 }}
       {{- else if .Values.nodeSelector }}
       nodeSelector:
-        {{ .Values.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.nodeSelector | toYaml | nindent 8 }}
       {{- end }}
       {{- with (default .Values.affinity .Values.mastodon.web.affinity) }}
       affinity:
diff --git a/templates/job-assets-copy.yaml b/templates/job-assets-copy.yaml
index 01c62dd..74d9fa9 100644
--- a/templates/job-assets-copy.yaml
+++ b/templates/job-assets-copy.yaml
@@ -91,10 +91,10 @@ spec:
           emptyDir: {}
       {{- if .Values.mastodon.hooks.s3Upload.nodeSelector }}
       nodeSelector:
-        {{ .Values.mastodon.hooks.s3Upload.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.mastodon.hooks.s3Upload.nodeSelector | toYaml | nindent 8 }}
       {{- else if .Values.nodeSelector }}
       nodeSelector:
-        {{ .Values.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.nodeSelector | toYaml | nindent 8 }}
       {{- end }}
 
 {{- end -}}
diff --git a/templates/job-create-admin.yaml b/templates/job-create-admin.yaml
index bea556f..c1c671b 100644
--- a/templates/job-create-admin.yaml
+++ b/templates/job-create-admin.yaml
@@ -97,9 +97,9 @@ spec:
           {{- end }}
       {{- if .Values.mastodon.createAdmin.nodeSelector }}
       nodeSelector:
-        {{ .Values.mastodon.createAdmin.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.mastodon.createAdmin.nodeSelector | toYaml | nindent 8 }}
       {{- else if .Values.nodeSelector }}
       nodeSelector:
-        {{ .Values.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.nodeSelector | toYaml | nindent 8 }}
       {{- end }}
 {{- end }}
diff --git a/templates/job-db-migrate.yaml b/templates/job-db-migrate.yaml
index 5b25a4c..d4839ee 100644
--- a/templates/job-db-migrate.yaml
+++ b/templates/job-db-migrate.yaml
@@ -2,9 +2,9 @@
 {{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" false ) .) }}
       {{- if .Values.mastodon.hooks.dbMigrate.nodeSelector }}
       nodeSelector:
-        {{ .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }}
       {{- else if .Values.nodeSelector }}
       nodeSelector:
-        {{ .Values.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.nodeSelector | toYaml | nindent 8 }}
       {{- end }}
 {{- end }}
diff --git a/templates/job-db-pre-migrate.yaml b/templates/job-db-pre-migrate.yaml
index 29fcb82..8f87b5f 100644
--- a/templates/job-db-pre-migrate.yaml
+++ b/templates/job-db-pre-migrate.yaml
@@ -2,9 +2,9 @@
 {{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" true ) .) }}
       {{- if .Values.mastodon.hooks.dbMigrate.nodeSelector }}
       nodeSelector:
-        {{ .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }}
       {{- else if .Values.nodeSelector }}
       nodeSelector:
-        {{ .Values.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.nodeSelector | toYaml | nindent 8 }}
       {{- end }}
 {{- end }}
diff --git a/templates/job-db-prepare.yaml b/templates/job-db-prepare.yaml
index 54bbb55..ca6324e 100644
--- a/templates/job-db-prepare.yaml
+++ b/templates/job-db-prepare.yaml
@@ -2,9 +2,9 @@
 {{- include "mastodon.dbMigrateJob" (merge (dict "prepare" true ) .) }}
       {{- if .Values.mastodon.hooks.dbPrepare.nodeSelector }}
       nodeSelector:
-        {{ .Values.mastodon.hooks.dbPrepare.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.mastodon.hooks.dbPrepare.nodeSelector | toYaml | nindent 8 }}
       {{- else if .Values.nodeSelector }}
       nodeSelector:
-        {{ .Values.nodeSelector | toYaml | nindent 8 }}
+        {{- .Values.nodeSelector | toYaml | nindent 8 }}
       {{- end }}
 {{- end }}