diff --git a/nagios/templates/deployment.yaml b/nagios/templates/deployment.yaml
index 2187121c1..53a8ced08 100644
--- a/nagios/templates/deployment.yaml
+++ b/nagios/templates/deployment.yaml
@@ -87,7 +87,7 @@ spec:
 {{ tuple $envAll $envAll.Values.pod.resources.nagios | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           ports:
             - name: metrics
-              containerPort: {{ .Values.network.nagios.port }}
+              containerPort: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           env:
             - name: PROMETHEUS_SERVICE
               value: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
diff --git a/nagios/templates/service.yaml b/nagios/templates/service.yaml
index 20c586b3f..e878871fe 100644
--- a/nagios/templates/service.yaml
+++ b/nagios/templates/service.yaml
@@ -23,8 +23,8 @@ metadata:
   name: {{ tuple "nagios" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
 spec:
   ports:
-  - name: nagios-metrics
-    port: {{ .Values.network.nagios.port }}
+  - name: metrics
+    port: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
     {{ if .Values.network.nagios.node_port.enabled }}
     nodePort: {{ .Values.network.nagios.node_port.port }}
     {{ end }}
diff --git a/nagios/values.yaml b/nagios/values.yaml
index b49d0e01d..ab62838fd 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -99,7 +99,6 @@ network:
     node_port:
       enabled: false
       port: 30925
-    port: 25
 
 pod:
   lifecycle: