diff --git a/grafana/templates/ingress-grafana.yaml b/grafana/templates/ingress-grafana.yaml
index 55c0d2fff..5fb7a698f 100644
--- a/grafana/templates/ingress-grafana.yaml
+++ b/grafana/templates/ingress-grafana.yaml
@@ -14,45 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.ingress }}
-{{- $envAll := . }}
-{{- if .Values.network.grafana.ingress.public }}
-{{- $backendServiceType := "grafana" }}
-{{- $backendPort := "dashboard" }}
-{{- $ingressName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $backendName := tuple $backendServiceType "internal" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostNameNamespaced := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
-{{- $hostNameFull := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  annotations:
-{{ toYaml .Values.network.grafana.ingress.annotations | indent 4 }}
-spec:
-  rules:
-{{ if ne $hostNameNamespaced $hostNameFull }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- else }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- if and .Values.manifests.ingress .Values.network.grafana.ingress.public }}
+{{- $ingressOpts := dict "envAll" . "backendService" "grafana" "backendServiceType" "grafana" "backendPort" "dashboard" -}}
+{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}
diff --git a/grafana/templates/service-ingress.yaml b/grafana/templates/service-ingress.yaml
index 5dbb337dd..8a1201a27 100644
--- a/grafana/templates/service-ingress.yaml
+++ b/grafana/templates/service-ingress.yaml
@@ -14,19 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.service_ingress }}
-{{- $envAll := . }}
-{{- if .Values.network.grafana.ingress.public }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ tuple "grafana" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
-  ports:
-  - name: http
-    port: 80
-  selector:
-    app: ingress-api
-{{- end }}
+{{- if and .Values.manifests.service_ingress .Values.network.grafana.ingress.public }}
+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "grafana" -}}
+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
 {{- end }}
diff --git a/grafana/values.yaml b/grafana/values.yaml
index adb43222d..47658f10f 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -162,6 +162,7 @@ endpoints:
     port:
       grafana:
         default: 3000
+        public: 80
   monitoring:
     name: prometheus
     namespace: null
@@ -226,9 +227,11 @@ network:
       port: 30902
     ingress:
       public: true
+      classes:
+        namespace: "nginx"
+        cluster: "nginx-cluster"
       annotations:
-        kubernetes.io/ingress.class: "nginx"
-        ingress.kubernetes.io/rewrite-target: /
+        nginx.ingress.kubernetes.io/rewrite-target: /
 
 secrets:
   oslo_db:
diff --git a/helm-toolkit/templates/manifests/_ingress.yaml.tpl b/helm-toolkit/templates/manifests/_ingress.yaml.tpl
index 09ca8515f..cf98bf504 100644
--- a/helm-toolkit/templates/manifests/_ingress.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_ingress.yaml.tpl
@@ -1,12 +1,9 @@
 {{/*
 Copyright 2017 The Openstack-Helm Authors.
-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-
    http://www.apache.org/licenses/LICENSE-2.0
-
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/helm-toolkit/templates/manifests/_service-ingress.tpl b/helm-toolkit/templates/manifests/_service-ingress.tpl
index 859b4b116..29be3f43b 100644
--- a/helm-toolkit/templates/manifests/_service-ingress.tpl
+++ b/helm-toolkit/templates/manifests/_service-ingress.tpl
@@ -1,12 +1,9 @@
 {{/*
 Copyright 2017 The Openstack-Helm Authors.
-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-
    http://www.apache.org/licenses/LICENSE-2.0
-
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/kibana/templates/ingress-kibana.yaml b/kibana/templates/ingress-kibana.yaml
index 0454f73bf..66db94ce9 100644
--- a/kibana/templates/ingress-kibana.yaml
+++ b/kibana/templates/ingress-kibana.yaml
@@ -14,47 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.ingress_kibana }}
-{{- $envAll := . }}
-{{- if .Values.network.kibana.ingress.public }}
-{{- $backendServiceType := "kibana" }}
-{{- $backendPort := "http" }}
-{{- $ingressName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $backendName := tuple $backendServiceType "internal" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostNameNamespaced := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
-{{- $hostNameFull := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
-    ingress.kubernetes.io/proxy-body-size: {{ .Values.network.kibana.ingress.proxy_body_size }}
-spec:
-  rules:
-{{ if ne $hostNameNamespaced $hostNameFull }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- else }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- if and .Values.manifests.ingress .Values.network.kibana.ingress.public }}
+{{- $ingressOpts := dict "envAll" . "backendService" "kibana" "backendServiceType" "kibana" "backendPort" "http" -}}
+{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}
diff --git a/kibana/templates/service-ingress-kibana.yaml b/kibana/templates/service-ingress-kibana.yaml
index 6c2fb838b..c78fc3a4f 100644
--- a/kibana/templates/service-ingress-kibana.yaml
+++ b/kibana/templates/service-ingress-kibana.yaml
@@ -14,19 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.service_ingress_kibana }}
-{{- if .Values.network.kibana.ingress.public }}
-{{- $envAll := . }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ tuple "kibana" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
-  ports:
-  - name: http
-    port: 80
-  selector:
-    app: ingress-api
-{{- end }}
+{{- if and .Values.manifests.service_ingress .Values.network.kibana.ingress.public }}
+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "kibana" -}}
+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
 {{- end }}
diff --git a/kibana/values.yaml b/kibana/values.yaml
index a8f2872c0..ca2326a46 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -176,7 +176,11 @@ network:
   kibana:
     ingress:
       public: true
-      proxy_body_size: 1024M
+      classes:
+        namespace: "nginx"
+        cluster: "nginx-cluster"
+      annotations:
+        nginx.ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30905
@@ -186,9 +190,9 @@ manifests:
   configmap_bin: true
   configmap_etc: true
   deployment: true
-  ingress_kibana: true
+  ingress: true
   job_image_repo_sync: true
   secret_elasticsearch: true
   secret_admin: true
   service: true
-  service_ingress_kibana: true
+  service_ingress: true
diff --git a/nagios/templates/ingress-nagios.yaml b/nagios/templates/ingress-nagios.yaml
index eec048d03..89b6c1ba2 100644
--- a/nagios/templates/ingress-nagios.yaml
+++ b/nagios/templates/ingress-nagios.yaml
@@ -14,47 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.ingress }}
-{{- $envAll := . }}
-{{- if .Values.network.nagios.ingress.public }}
-{{- $backendServiceType := "nagios" }}
-{{- $backendPort := "n-metrics" }}
-{{- $ingressName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $backendName := tuple $backendServiceType "internal" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostNameNamespaced := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
-{{- $hostNameFull := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
-    ingress.kubernetes.io/proxy-body-size: {{ .Values.network.prometheus.ingress.proxy_body_size }}
-spec:
-  rules:
-{{ if ne $hostNameNamespaced $hostNameFull }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- else }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- if and .Values.manifests.ingress .Values.network.nagios.ingress.public }}
+{{- $ingressOpts := dict "envAll" . "backendService" "nagios" "backendServiceType" "nagios" "backendPort" "metrics" -}}
+{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}
diff --git a/nagios/templates/service-ingress-nagios.yaml b/nagios/templates/service-ingress-nagios.yaml
index 1a4d06ae8..c0b52cf17 100644
--- a/nagios/templates/service-ingress-nagios.yaml
+++ b/nagios/templates/service-ingress-nagios.yaml
@@ -14,19 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.service_ingress }}
-{{- if .Values.network.nagios.ingress.public }}
-{{- $envAll := . }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ tuple "nagios" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
-  ports:
-  - name: http
-    port: 80
-  selector:
-    app: ingress-api
-{{- end }}
+{{- if and .Values.manifests.service_ingress .Values.network.nagios.ingress.public }}
+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "nagios" -}}
+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
 {{- end }}
diff --git a/nagios/values.yaml b/nagios/values.yaml
index ab62838fd..b58b54124 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -95,7 +95,11 @@ network:
   nagios:
     ingress:
       public: true
-      proxy_body_size: 1024M
+      classes:
+        namespace: "nginx"
+        cluster: "nginx-cluster"
+      annotations:
+        nginx.ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30925
@@ -135,8 +139,10 @@ manifests:
   configmap_bin: true
   configmap_etc: true
   deployment: true
+  ingress: true
   job_image_repo_sync: true
   service: true
+  service_ingress: true
 
 conf:
   nagios:
diff --git a/prometheus-alertmanager/templates/ingress-alertmanager.yaml b/prometheus-alertmanager/templates/ingress-alertmanager.yaml
index 490aa780c..41ca10f34 100644
--- a/prometheus-alertmanager/templates/ingress-alertmanager.yaml
+++ b/prometheus-alertmanager/templates/ingress-alertmanager.yaml
@@ -14,47 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.ingress }}
-{{- $envAll := . }}
-{{- if .Values.network.alertmanager.ingress.public }}
-{{- $backendServiceType := "alerts" }}
-{{- $backendPort := "alerts-api" }}
-{{- $ingressName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $backendName := tuple $backendServiceType "internal" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostNameNamespaced := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
-{{- $hostNameFull := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
-    ingress.kubernetes.io/proxy-body-size: {{ .Values.network.alertmanager.ingress.proxy_body_size }}
-spec:
-  rules:
-{{ if ne $hostNameNamespaced $hostNameFull }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- else }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- if and .Values.manifests.ingress .Values.network.alertmanager.ingress.public }}
+{{- $ingressOpts := dict "envAll" . "backendService" "alertmanager" "backendServiceType" "alerts" "backendPort" "alerts-api" -}}
+{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}
diff --git a/prometheus-alertmanager/templates/service-ingress-alertmanager.yaml b/prometheus-alertmanager/templates/service-ingress-alertmanager.yaml
index 826f0e5f0..809cf5aeb 100644
--- a/prometheus-alertmanager/templates/service-ingress-alertmanager.yaml
+++ b/prometheus-alertmanager/templates/service-ingress-alertmanager.yaml
@@ -14,19 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.service_ingress }}
-{{- $envAll := . }}
-{{- if .Values.network.alertmanager.ingress.public }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ tuple "alerts" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
-  ports:
-  - name: http
-    port: 80
-  selector:
-    app: ingress-api
-{{- end }}
+{{- if and .Values.manifests.service_ingress .Values.network.alertmanager.ingress.public }}
+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "alerts" -}}
+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
 {{- end }}
diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml
index d0127a049..0cb74af5f 100644
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@@ -129,7 +129,11 @@ network:
   alertmanager:
     ingress:
       public: true
-      proxy_body_size: 1024M
+      classes:
+        namespace: "nginx"
+        cluster: "nginx-cluster"
+      annotations:
+        nginx.ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30903
diff --git a/prometheus/templates/ingress-prometheus.yaml b/prometheus/templates/ingress-prometheus.yaml
index 6a62a94ec..ae2e9ad42 100644
--- a/prometheus/templates/ingress-prometheus.yaml
+++ b/prometheus/templates/ingress-prometheus.yaml
@@ -14,47 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.ingress_prometheus }}
-{{- $envAll := . }}
-{{- if .Values.network.prometheus.ingress.public }}
-{{- $backendServiceType := "monitoring" }}
-{{- $backendPort := "prom-metrics" }}
-{{- $ingressName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $backendName := tuple $backendServiceType "internal" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostName := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $hostNameNamespaced := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
-{{- $hostNameFull := tuple $backendServiceType "public" $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/rewrite-target: /
-    ingress.kubernetes.io/proxy-body-size: {{ .Values.network.prometheus.ingress.proxy_body_size }}
-spec:
-  rules:
-{{ if ne $hostNameNamespaced $hostNameFull }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- else }}
-{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced }}
-  - host: {{ $vHost }}
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: {{ $backendName }}
-          servicePort: {{ $backendPort }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- if and .Values.manifests.ingress .Values.network.prometheus.ingress.public }}
+{{- $ingressOpts := dict "envAll" . "backendService" "prometheus" "backendServiceType" "monitoring" "backendPort" "prom-metrics" -}}
+{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}
diff --git a/prometheus/templates/service-ingress-prometheus.yaml b/prometheus/templates/service-ingress-prometheus.yaml
index 62bc2511b..57781c64a 100644
--- a/prometheus/templates/service-ingress-prometheus.yaml
+++ b/prometheus/templates/service-ingress-prometheus.yaml
@@ -14,19 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if .Values.manifests.service_ingress_prometheus }}
-{{- if .Values.network.prometheus.ingress.public }}
-{{- $envAll := . }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ tuple "monitoring" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
-  ports:
-  - name: http
-    port: 80
-  selector:
-    app: ingress-api
-{{- end }}
+{{- if and .Values.manifests.service_ingress .Values.network.prometheus.ingress.public }}
+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "monitoring" -}}
+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
 {{- end }}
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index 39daf5c44..1456b1bf9 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -156,7 +156,11 @@ network:
   prometheus:
     ingress:
       public: true
-      proxy_body_size: 1024M
+      classes:
+        namespace: "nginx"
+        cluster: "nginx-cluster"
+      annotations:
+        nginx.ingress.kubernetes.io/rewrite-target: /
     node_port:
       enabled: false
       port: 30900
@@ -173,10 +177,10 @@ storage:
 manifests:
   configmap_bin: true
   configmap_etc: true
-  ingress_prometheus: true
+  ingress: true
   helm_tests: true
   job_image_repo_sync: true
-  service_ingress_prometheus: true
+  service_ingress: true
   service: true
   statefulset_prometheus: true