diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml
index 86150b1361..43fc0d2725 100644
--- a/ingress/templates/deployment-ingress.yaml
+++ b/ingress/templates/deployment-ingress.yaml
@@ -75,6 +75,7 @@ spec:
           args:
             - /nginx-ingress-controller
             - '--default-backend-service=$(POD_NAMESPACE)/ingress-error-pages'
+            - --configmap=$(POD_NAMESPACE)/nginx-custom-configuration
 {{- if .Values.network.host_namespace }}
           volumeMounts:
             - name: ingress-etc
diff --git a/ingress/templates/nginx-custom-configuration.yaml b/ingress/templates/nginx-custom-configuration.yaml
new file mode 100644
index 0000000000..c687a43834
--- /dev/null
+++ b/ingress/templates/nginx-custom-configuration.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nginx-custom-configuration
+data:
+  enable-underscores-in-headers: "true"
+