diff --git a/charts/argo-cd/templates/argocd-metrics-service.yaml b/charts/argo-cd/templates/argocd-metrics-service.yaml
index f3a7b4f2..853c467e 100755
--- a/charts/argo-cd/templates/argocd-metrics-service.yaml
+++ b/charts/argo-cd/templates/argocd-metrics-service.yaml
@@ -7,14 +7,13 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
-    app.kubernetes.io/component: server
+    app.kubernetes.io/component: application-controller
   name: argocd-metrics
 spec:
   ports:
-  - name: http
+  - name: metrics
     protocol: TCP
-    port: {{ .Values.server.serviceMetricsPort }}
-    targetPort: {{ .Values.server.containerMetricsPort }}
+    port: {{ .Values.applicationController.servicePort }}
+    targetPort: {{ .Values.applicationController.containerPort }}
   selector:
-    app: {{ include "argo-cd.name" . }}-server
-    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index f3b40b19..2c19851f 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -10,8 +10,6 @@ server:
   containerPort: 8080
   servicePortHttp: 80
   servicePortHttps: 443
-  containerMetricsPort: 8082
-  serviceMetricsPort: 8082
   serviceAnnotations: {}
   image:
     repository: argoproj/argocd