diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml
index aa9445d..311aeba 100644
--- a/charts/docker-mailserver/templates/deployment.yaml
+++ b/charts/docker-mailserver/templates/deployment.yaml
@@ -272,7 +272,7 @@ spec:
 
           ports:
             - containerPort: 9154
-              name: http
+              name: metrics
               protocol: TCP
           resources:
 {{ toYaml .Values.metrics.resources | indent 12 }}
diff --git a/charts/docker-mailserver/templates/service.yaml b/charts/docker-mailserver/templates/service.yaml
index eac6ff7..7c7861f 100644
--- a/charts/docker-mailserver/templates/service.yaml
+++ b/charts/docker-mailserver/templates/service.yaml
@@ -137,8 +137,8 @@ spec:
  
   {{- if .Values.metrics.enabled }}
     - name: metrics
-      port: 9154
-      targetPort: 9154       
+      port: {{ .Values.monitoring.service.port }}
+      targetPort: metrics       
   {{- end }}
 
   type: {{ default "ClusterIP" .Values.service.type }}