diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
index ee62aa00..67dda492 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
@@ -27,9 +27,6 @@ spec:
     - {{ .Release.Namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
       app.kubernetes.io/name: {{ .Release.Name }}
-      argocd.argoproj.io/instance: freeleaps-prod-authentication
 {{- end }}
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
index 86cf91dc..780e700f 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/service.yaml
@@ -19,11 +19,6 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
   selector:
     app.kubernetes.io/version: {{ $appVersion }}
     app.kubernetes.io/name: "central-storage"
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
index c2f45b8b..a0e3df83 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
@@ -15,7 +15,7 @@ metadata:
 spec:
   endpoints:
   - path: /api/_/metrics
-    port: http
+    targetPort: {{ .Values.centralStorage.serviceMonitor.port }}
     {{- if .Values.centralStorage.serviceMonitor.interval }}
     interval: {{ .Values.centralStorage.serviceMonitor.interval }}
     {{- end }}
diff --git a/freeleaps/helm-pkg/centralStorage/values.prod.yaml b/freeleaps/helm-pkg/centralStorage/values.prod.yaml
index 01d6d8a2..2b5be940 100644
--- a/freeleaps/helm-pkg/centralStorage/values.prod.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.prod.yaml
@@ -45,6 +45,7 @@ centralStorage:
         terminationGracePeriodSeconds: 30
   serviceMonitor:
     enabled: true
+    targetPort: 8005
     labels:
       release: kube-prometheus-stack
     namespace: freeleaps-monitoring-system
diff --git a/freeleaps/helm-pkg/centralStorage/values.yaml b/freeleaps/helm-pkg/centralStorage/values.yaml
index af6e9215..34dfd095 100644
--- a/freeleaps/helm-pkg/centralStorage/values.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.yaml
@@ -25,6 +25,7 @@ central-storage:
   probes: {}
   serviceMonitor:
     enabled: false
+    targetPort: 8005
     labels: {}
     namespace: ""
     internal: 30s
diff --git a/freeleaps/helm-pkg/content/templates/content/service.yaml b/freeleaps/helm-pkg/content/templates/content/service.yaml
index f0329129..8f4e4204 100644
--- a/freeleaps/helm-pkg/content/templates/content/service.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/service.yaml
@@ -19,11 +19,6 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
   selector:
     app.kubernetes.io/version: {{ $appVersion }}
     app.kubernetes.io/name: "content"
diff --git a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
index 0c16db3b..197d4700 100644
--- a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
@@ -15,7 +15,7 @@ metadata:
 spec:
   endpoints:
   - path: /api/_/metrics
-    port: http
+    port: {{ .Values.content.serviceMonitor.port }}
     {{- if .Values.content.serviceMonitor.interval }}
     interval: {{ .Values.content.serviceMonitor.interval }}
     {{- end }}
@@ -27,6 +27,6 @@ spec:
     - {{ .Release.Namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}
 {{- end }}
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/content/values.prod.yaml b/freeleaps/helm-pkg/content/values.prod.yaml
index a8e4b96f..1d12d107 100644
--- a/freeleaps/helm-pkg/content/values.prod.yaml
+++ b/freeleaps/helm-pkg/content/values.prod.yaml
@@ -45,6 +45,7 @@ content:
         terminationGracePeriodSeconds: 30
   serviceMonitor:
     enabled: true
+    port: 8013
     labels:
       release: kube-prometheus-stack
     namespace: freeleaps-monitoring-system
diff --git a/freeleaps/helm-pkg/content/values.yaml b/freeleaps/helm-pkg/content/values.yaml
index 13f1060b..9b244559 100644
--- a/freeleaps/helm-pkg/content/values.yaml
+++ b/freeleaps/helm-pkg/content/values.yaml
@@ -25,6 +25,7 @@ content:
   probes: {}
   serviceMonitor:
     enabled: false
+    port: 8013
     labels: {}
     namespace: ""
     internal: 30s
diff --git a/freeleaps/helm-pkg/notification/templates/notification/service.yaml b/freeleaps/helm-pkg/notification/templates/notification/service.yaml
index cd9d4529..89b8ebbf 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/service.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/service.yaml
@@ -19,11 +19,6 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
   selector:
     app.kubernetes.io/version: {{ $appVersion }}
     app.kubernetes.io/name: "notification"
diff --git a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
index 4d07ff06..c6858df4 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
@@ -15,7 +15,7 @@ metadata:
 spec:
   endpoints:
   - path: /api/_/metrics
-    port: http
+    port: {{ .Values.notification.serviceMonitor.port }}
     {{- if .Values.notification.serviceMonitor.interval }}
     interval: {{ .Values.notification.serviceMonitor.interval }}
     {{- end }}
@@ -27,6 +27,6 @@ spec:
     - {{ .Release.Namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}
 {{- end }}
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/notification/values.prod.yaml b/freeleaps/helm-pkg/notification/values.prod.yaml
index d966f12d..6e530d45 100644
--- a/freeleaps/helm-pkg/notification/values.prod.yaml
+++ b/freeleaps/helm-pkg/notification/values.prod.yaml
@@ -45,6 +45,7 @@ notification:
         terminationGracePeriodSeconds: 30
   serviceMonitor:
     enabled: true
+    port: 8003
     labels:
       release: kube-prometheus-stack
     namespace: freeleaps-monitoring-system
diff --git a/freeleaps/helm-pkg/notification/values.yaml b/freeleaps/helm-pkg/notification/values.yaml
index bd8e1ea7..d03aeedd 100644
--- a/freeleaps/helm-pkg/notification/values.yaml
+++ b/freeleaps/helm-pkg/notification/values.yaml
@@ -25,6 +25,7 @@ notification:
   probes: {}
   serviceMonitor:
     enabled: false
+    port: 8003
     labels: {}
     namespace: ""
     internal: 30s
diff --git a/freeleaps/helm-pkg/payment/templates/payment/service.yaml b/freeleaps/helm-pkg/payment/templates/payment/service.yaml
index 911ed77a..5f5b7d93 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/service.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/service.yaml
@@ -19,11 +19,6 @@ spec:
   ports:
     - port: {{ $service.port }}
       targetPort: {{ $service.targetPort }}
-    {{- if $serviceMonitorEnabled }}
-    - port: {{ $service.port }}
-      targetPort: {{ $service.targetPort }}
-      name: metrics
-    {{- end }}
   selector:
     app.kubernetes.io/version: {{ $appVersion }}
     app.kubernetes.io/name: "payment"
diff --git a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
index 74c33158..9430c5dc 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
@@ -15,7 +15,7 @@ metadata:
 spec:
   endpoints:
   - path: /api/_/metrics
-    port: http
+    port: {{ .Values.payment.serviceMonitor.port }}
     {{- if .Values.payment.serviceMonitor.interval }}
     interval: {{ .Values.payment.serviceMonitor.interval }}
     {{- end }}
@@ -27,6 +27,6 @@ spec:
     - {{ .Release.Namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/name: {{ .Release.Name }}
 {{- end }}
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/payment/values.prod.yaml b/freeleaps/helm-pkg/payment/values.prod.yaml
index 23919fdb..0d179544 100644
--- a/freeleaps/helm-pkg/payment/values.prod.yaml
+++ b/freeleaps/helm-pkg/payment/values.prod.yaml
@@ -45,6 +45,7 @@ payment:
         terminationGracePeriodSeconds: 30
   serviceMonitor:
     enabled: true
+    port: 8006
     labels:
       release: kube-prometheus-stack
     namespace: freeleaps-monitoring-system
diff --git a/freeleaps/helm-pkg/payment/values.yaml b/freeleaps/helm-pkg/payment/values.yaml
index 5863829f..d844e5fd 100644
--- a/freeleaps/helm-pkg/payment/values.yaml
+++ b/freeleaps/helm-pkg/payment/values.yaml
@@ -25,6 +25,7 @@ payment:
   probes: {}
   serviceMonitor:
     enabled: false
+    port: 8006
     labels: {}
     namespace: ""
     internal: 30s