diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml
index a7bb76b1..dd734a88 100644
--- a/charts/argo-events/templates/eventbus-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml
@@ -50,22 +50,18 @@ spec:
             initialDelaySeconds: 3
             periodSeconds: 3
       {{- with .Values.securityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
+      securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- if .Values.eventbusController.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.eventbusController.nodeSelector | indent 8 }}
-{{- end }}
-{{- if .Values.eventbusController.tolerations }}
-      tolerations:
-{{ toYaml .Values.eventbusController.tolerations | indent 8 }}
-{{- end }}
-{{- if .Values.eventbusController.affinity }}
-      affinity:
-{{ toYaml .Values.eventbusController.affinity | indent 8 }}
-{{- end }}
+      {{- if .Values.eventbusController.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.eventbusController.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventbusController.tolerations }}
+      tolerations: {{ toYaml .Values.eventbusController.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventbusController.affinity }}
+      affinity: {{ toYaml .Values.eventbusController.affinity | nindent 8 }}
+      {{- end }}
diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml
index 3dc13661..95e7e83a 100644
--- a/charts/argo-events/templates/eventsource-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml
@@ -48,22 +48,18 @@ spec:
             initialDelaySeconds: 3
             periodSeconds: 3
       {{- with .Values.securityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
+      securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- if .Values.eventsourceController.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.eventsourceController.nodeSelector | indent 8 }}
-{{- end }}
-{{- if .Values.eventsourceController.tolerations }}
-      tolerations:
-{{ toYaml .Values.eventsourceController.tolerations | indent 8 }}
-{{- end }}
-{{- if .Values.eventsourceController.affinity }}
-      affinity:
-{{ toYaml .Values.eventsourceController.affinity | indent 8 }}
-{{- end }}
+      {{- if .Values.eventsourceController.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.eventsourceController.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventsourceController.tolerations }}
+      tolerations: {{ toYaml .Values.eventsourceController.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventsourceController.affinity }}
+      affinity: {{ toYaml .Values.eventsourceController.affinity | nindent 8 }}
+      {{- end }}
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index b8db3190..214ee2bb 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -48,22 +48,18 @@ spec:
             initialDelaySeconds: 3
             periodSeconds: 3
       {{- with .Values.securityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
+      securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- if .Values.sensorController.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.sensorController.nodeSelector | indent 8 }}
-{{- end }}
-{{- if .Values.sensorController.tolerations }}
-      tolerations:
-{{ toYaml .Values.sensorController.tolerations | indent 8 }}
-{{- end }}
-{{- if .Values.sensorController.affinity }}
-      affinity:
-{{ toYaml .Values.sensorController.affinity | indent 8 }}
-{{- end }}
+      {{- if .Values.sensorController.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.sensorController.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.sensorController.tolerations }}
+      tolerations: {{ toYaml .Values.sensorController.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.sensorController.affinity }}
+      affinity: {{ toYaml .Values.sensorController.affinity | nindent 8 }}
+      {{- end }}