diff --git a/charts/keycloak/Chart.yaml b/charts/keycloak/Chart.yaml
index 53d70e73d..85e7b1383 100644
--- a/charts/keycloak/Chart.yaml
+++ b/charts/keycloak/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: keycloak
 description: Open Source Identity and Access Management Solution
 type: application
-version: 0.21.1
+version: 0.21.2
 appVersion: "26.6.1"
 keywords:
   - keycloak
diff --git a/charts/keycloak/templates/metrics-service.yaml b/charts/keycloak/templates/metrics-service.yaml
index e44156c01..e0383a5b5 100644
--- a/charts/keycloak/templates/metrics-service.yaml
+++ b/charts/keycloak/templates/metrics-service.yaml
@@ -19,7 +19,7 @@ spec:
   type: {{ .Values.metrics.service.type }}
   ports:
     - port: {{ .Values.metrics.service.port }}
-      targetPort: {{ .Values.metrics.service.targetPort }}
+      targetPort: {{ if eq (int .Values.metrics.service.port) (int .Values.keycloak.managementPort) }}management{{ else }}{{ .Values.metrics.service.targetPort }}{{ end }}
       protocol: TCP
       name: {{ .Values.metrics.service.targetPort }}
   selector:
diff --git a/charts/keycloak/templates/statefulset.yaml b/charts/keycloak/templates/statefulset.yaml
index e2c6d095e..8ff255880 100644
--- a/charts/keycloak/templates/statefulset.yaml
+++ b/charts/keycloak/templates/statefulset.yaml
@@ -234,7 +234,7 @@ spec:
             - name: management
               containerPort: {{ .Values.keycloak.managementPort }}
               protocol: TCP
-            {{- if .Values.metrics.enabled }}
+            {{- if and .Values.metrics.enabled (ne (int .Values.metrics.service.port) (int .Values.keycloak.managementPort)) }}
             - name: {{ .Values.metrics.service.targetPort }}
               containerPort: {{ .Values.metrics.service.port }}
               protocol: TCP