diff --git a/templates/deployments.yaml b/templates/deployments.yaml
index 110c6bba..64729d0b 100644
--- a/templates/deployments.yaml
+++ b/templates/deployments.yaml
@@ -104,16 +104,13 @@ spec:
           emptyDir:
             medium: Memory
     {{- with .Values.st2auth.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2auth.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2auth.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -218,16 +215,13 @@ spec:
 {{- include "packs-volumes" . | indent 8 }}
         {{- end }}
     {{- with .Values.st2api.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2api.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2api.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -301,16 +295,13 @@ spec:
           configMap:
             name: {{ .Release.Name }}-st2-config
     {{- with .Values.st2stream.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2stream.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2stream.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -400,16 +391,13 @@ spec:
       volumes: []
     {{- end }}
     {{- with .Values.st2web.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2web.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2web.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -489,16 +477,13 @@ spec:
               path: datastore_key.json
         {{- end }}
     {{- with .Values.st2rulesengine.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2rulesengine.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2rulesengine.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -571,16 +556,13 @@ spec:
           configMap:
             name: {{ .Release.Name }}-st2-config
     {{- with .Values.st2timersengine.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2timersengine.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2timersengine.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -666,16 +648,13 @@ spec:
               path: datastore_key.json
         {{- end }}
     {{- with .Values.st2workflowengine.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2workflowengine.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2workflowengine.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -760,16 +739,13 @@ spec:
           configMap:
             name: {{ .Release.Name }}-st2-config
     {{- with .Values.st2scheduler.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2scheduler.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2scheduler.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -841,16 +817,13 @@ spec:
           configMap:
             name: {{ .Release.Name }}-st2-config
     {{- with .Values.st2notifier.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2notifier.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2notifier.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 {{- range .Values.st2.packs.sensors }}
@@ -972,16 +945,13 @@ spec:
 {{- include "packs-volumes" $ | indent 8 }}
         {{- end }}
     {{- with .nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
 
@@ -1102,16 +1072,13 @@ spec:
 {{- include "packs-volumes" . | indent 8 }}
         {{- end }}
     {{- with .Values.st2actionrunner.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2actionrunner.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2actionrunner.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -1183,16 +1150,13 @@ spec:
           configMap:
             name: {{ .Release.Name }}-st2-config
     {{- with .Values.st2garbagecollector.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2garbagecollector.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2garbagecollector.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 
 ---
@@ -1457,15 +1421,12 @@ spec:
           {{- toYaml .Values.st2chatops.hubotScriptsVolume | nindent 10 }}
     {{- end }}
     {{- with .Values.st2chatops.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2chatops.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
+      affinity: {{- toYaml . | nindent 8 }}
     {{- end }}
     {{- with .Values.st2chatops.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}