diff --git a/grafana/templates/secret-ingress-tls.yaml b/grafana/templates/secret-ingress-tls.yaml
index 09495bc39..039177ded 100644
--- a/grafana/templates/secret-ingress-tls.yaml
+++ b/grafana/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "grafana" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "grafana" "backendService" "grafana" ) }}
 {{- end }}
diff --git a/kibana/templates/secret-ingress-tls.yaml b/kibana/templates/secret-ingress-tls.yaml
index 2281fdff3..c874ea53f 100644
--- a/kibana/templates/secret-ingress-tls.yaml
+++ b/kibana/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "kibana" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "kibana" "backendService" "kibana" ) }}
 {{- end }}
diff --git a/nagios/templates/deployment.yaml b/nagios/templates/deployment.yaml
index e62c257ce..0e057b507 100644
--- a/nagios/templates/deployment.yaml
+++ b/nagios/templates/deployment.yaml
@@ -143,11 +143,6 @@ spec:
           ports:
             - name: nagios
               containerPort: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-          readinessProbe:
-            tcpSocket:
-              port: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-            initialDelaySeconds: 20
-            periodSeconds: 10
           env:
             - name: PROMETHEUS_SERVICE
               value: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
diff --git a/nagios/templates/secret-ingress-tls.yaml b/nagios/templates/secret-ingress-tls.yaml
index 9524cfcb1..dacb1e9b5 100644
--- a/nagios/templates/secret-ingress-tls.yaml
+++ b/nagios/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "nagios" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "nagios" "backendService" "nagios" ) }}
 {{- end }}
diff --git a/prometheus-alertmanager/templates/secret-ingress-tls.yaml b/prometheus-alertmanager/templates/secret-ingress-tls.yaml
index 1409b0cb1..0e57c12b8 100644
--- a/prometheus-alertmanager/templates/secret-ingress-tls.yaml
+++ b/prometheus-alertmanager/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "alerts" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "alerts" "backendService" "alertmanager") }}
 {{- end }}
diff --git a/prometheus/templates/secret-ingress-tls.yaml b/prometheus/templates/secret-ingress-tls.yaml
index 44501abc0..c93e8262d 100644
--- a/prometheus/templates/secret-ingress-tls.yaml
+++ b/prometheus/templates/secret-ingress-tls.yaml
@@ -15,5 +15,5 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "monitoring" ) }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "monitoring" "backendService" "prometheus" ) }}
 {{- end }}