diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml
index 562d8899ede2..68e4f4355ef4 100644
--- a/stable/nginx-ingress/templates/controller-daemonset.yaml
+++ b/stable/nginx-ingress/templates/controller-daemonset.yaml
@@ -28,9 +28,17 @@ spec:
           args:
             - /nginx-ingress-controller
             - --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "defaultBackend.fullname" . }}{{ else }}{{ .Values.controller.defaultBackendService }}{{ end }}
+          {{- if (contains "0.9" .Values.controller.image.tag) }}
+            - --configmap={{ .Release.Namespace }}/{{ template "controller.fullname" . }}
+          {{- else }}
             - --nginx-configmap={{ .Release.Namespace }}/{{ template "controller.fullname" . }}
+          {{- end }}
+          {{- if .Values.tcp }}
             - --tcp-services-configmap={{ .Release.Namespace }}/{{ template "fullname" . }}-tcp
+          {{- end }}
+          {{- if .Values.udp }}
             - --udp-services-configmap={{ .Release.Namespace }}/{{ template "fullname" . }}-udp
+          {{- end }}
           {{- if .Values.controller.scope.enabled }}
             - --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
           {{- end }}
diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml
index 038fbe5b2ac3..1e572d3c5a8e 100644
--- a/stable/nginx-ingress/templates/controller-deployment.yaml
+++ b/stable/nginx-ingress/templates/controller-deployment.yaml
@@ -29,9 +29,17 @@ spec:
           args:
             - /nginx-ingress-controller
             - --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "defaultBackend.fullname" . }}{{ else }}{{ .Values.controller.defaultBackendService }}{{ end }}
+          {{- if (contains "0.9" .Values.controller.image.tag) }}
+            - --configmap={{ .Release.Namespace }}/{{ template "controller.fullname" . }}
+          {{- else }}
             - --nginx-configmap={{ .Release.Namespace }}/{{ template "controller.fullname" . }}
+          {{- end }}
+          {{- if .Values.tcp }}
             - --tcp-services-configmap={{ .Release.Namespace }}/{{ template "fullname" . }}-tcp
+          {{- end }}
+          {{- if .Values.udp }}
             - --udp-services-configmap={{ .Release.Namespace }}/{{ template "fullname" . }}-udp
+          {{- end }}
           {{- if .Values.controller.scope.enabled }}
             - --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
           {{- end }}
diff --git a/stable/nginx-ingress/templates/tcp-configmap.yaml b/stable/nginx-ingress/templates/tcp-configmap.yaml
index 9cf7a61d7524..02dbc6323ab1 100644
--- a/stable/nginx-ingress/templates/tcp-configmap.yaml
+++ b/stable/nginx-ingress/templates/tcp-configmap.yaml
@@ -10,7 +10,5 @@ metadata:
     release: {{ .Release.Name }}
   name: {{ template "fullname" . }}-tcp
 data:
-{{- if .Values.tcp }}
 {{ toYaml .Values.tcp | indent 2 }}
 {{- end }}
-{{- end }}
diff --git a/stable/nginx-ingress/templates/udp-configmap.yaml b/stable/nginx-ingress/templates/udp-configmap.yaml
index f11e4b201145..1ef315cf94b7 100644
--- a/stable/nginx-ingress/templates/udp-configmap.yaml
+++ b/stable/nginx-ingress/templates/udp-configmap.yaml
@@ -10,7 +10,5 @@ metadata:
     release: {{ .Release.Name }}
   name: {{ template "fullname" . }}-udp
 data:
-{{- if .Values.udp }}
 {{ toYaml .Values.udp | indent 2 }}
 {{- end }}
-{{- end }}