diff --git a/charts/aws-service-operator/templates/deployment.yaml b/charts/aws-service-operator/templates/deployment.yaml
index 350a56a93..1c83dd4ae 100644
--- a/charts/aws-service-operator/templates/deployment.yaml
+++ b/charts/aws-service-operator/templates/deployment.yaml
@@ -57,13 +57,9 @@ spec:
             {{- if .Values.operator.resources }}
             - --resources={{ .Values.operator.resources }}
             {{- end }}
-            {{- range $key, $value := .Values.extraArgs }}
-            {{- if $value }}
-            - --{{ $key }}={{ $value }}
-            {{- else }}
-            - --{{ $key }}
-            {{- end }}
             {{- end }}
+            {{- range $arg := .Values.extraArgs }}
+            - {{ $arg }}
             {{- end }}
           {{- if .Values.affinity }}
           affinity:
@@ -71,9 +67,9 @@ spec:
           {{- end }}
           {{- if .Values.extraEnv}}
           env:
-            {{- range $key, $value := .Values.extraEnv }}
-            - name: {{ $key }}
-              value: {{ $value }}
+            {{- range $env := .Values.extraEnv }}
+            - name: {{ $env.name }}
+              value: {{ $env.value }}
             {{- end }}
           {{- end }}
           {{- if .Values.resources }}