diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
index 67dda492..21d8ae6e 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
@@ -1,32 +1,43 @@
-{{- if .Values.authentication.serviceMonitor.enabled }}
+{{ $namespace := .Release.Namespace }}
+{{ $appVersion := .Chart.AppVersion | quote }}
+{{ $releaseService := .Release.Service }}
+{{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.authentication.serviceMonitor.enabled }}
+
+{{- if $serviceMonitorEnabled }}
+{{- range $service := .Values.authentication.services }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-service-monitor
+  name: {{ $service.name }}-service-monitor
   namespace: {{ .Values.authentication.serviceMonitor.namespace }}
   labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: {{ .Release.Name }}-service-monitor
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ $appVersion }}
+    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/managed-by: {{ $releaseService }}
+    app.kubernetes.io/instance: {{ $releaseName }}
     {{- if .Values.authentication.serviceMonitor.labels }}
     {{- toYaml .Values.authentication.serviceMonitor.labels | nindent 4 }}
     {{- end }}
 spec:
   endpoints:
-  - path: /api/_/metrics
-    targetPort: {{ .Values.authentication.serviceMonitor.port }}
-    {{- if .Values.authentication.serviceMonitor.interval }}
-    interval: {{ .Values.authentication.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.authentication.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.authentication.serviceMonitor.scrapeTimeout }}
-    {{- end }}
+    - path: /api/_/metrics
+      targetPort: {{ $service.targetPort }}
+      {{- if .Values.authentication.serviceMonitor.interval }}
+      interval: {{ .Values.authentication.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.authentication.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.authentication.serviceMonitor.scrapeTimeout }}
+      {{- end }}
   namespaceSelector:
     matchNames:
-    - {{ .Release.Namespace | quote }}
+      - {{ $namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ .Release.Name }}
+      app.kubernetes.io/version: {{ $appVersion }}
+      app.kubernetes.io/name: {{ $service.name }}
+      app.kubernetes.io/managed-by: {{ $releaseService }}
+      app.kubernetes.io/instance: {{ $releaseName }}
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/authentication/values.prod.yaml b/freeleaps/helm-pkg/authentication/values.prod.yaml
index d047f77a..a87a603e 100644
--- a/freeleaps/helm-pkg/authentication/values.prod.yaml
+++ b/freeleaps/helm-pkg/authentication/values.prod.yaml
@@ -45,7 +45,6 @@ authentication:
         terminationGracePeriodSeconds: 30
   serviceMonitor:
     enabled: true
-    port: 8004
     labels:
       release: kube-prometheus-stack
     namespace: freeleaps-monitoring-system
diff --git a/freeleaps/helm-pkg/authentication/values.yaml b/freeleaps/helm-pkg/authentication/values.yaml
index 13df6f68..c06d4219 100644
--- a/freeleaps/helm-pkg/authentication/values.yaml
+++ b/freeleaps/helm-pkg/authentication/values.yaml
@@ -25,7 +25,6 @@ authentication:
   probes: {}
   serviceMonitor:
     enabled: false
-    port: 8004
     labels: {}
     namespace: ""
     internal: 30s
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
index 96483632..4ccdf4ea 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
@@ -1,32 +1,43 @@
-{{- if .Values.centralStorage.serviceMonitor.enabled }}
+{{ $namespace := .Release.Namespace }}
+{{ $appVersion := .Chart.AppVersion | quote }}
+{{ $releaseService := .Release.Service }}
+{{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.centralStorage.serviceMonitor.enabled }}
+
+{{- if $serviceMonitorEnabled }}
+{{- range $service := .Values.centralStorage.services }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-service-monitor
+  name: {{ $service.name }}-service-monitor
   namespace: {{ .Values.centralStorage.serviceMonitor.namespace }}
   labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: {{ .Release.Name }}-service-monitor
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ $appVersion }}
+    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/managed-by: {{ $releaseService }}
+    app.kubernetes.io/instance: {{ $releaseName }}
     {{- if .Values.centralStorage.serviceMonitor.labels }}
     {{- toYaml .Values.centralStorage.serviceMonitor.labels | nindent 4 }}
     {{- end }}
 spec:
   endpoints:
-  - path: /api/_/metrics
-    targetPort: {{ .Values.centralStorage.serviceMonitor.port }}
-    {{- if .Values.centralStorage.serviceMonitor.interval }}
-    interval: {{ .Values.centralStorage.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.centralStorage.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.centralStorage.serviceMonitor.scrapeTimeout }}
-    {{- end }}
+    - path: /api/_/metrics
+      targetPort: {{ $service.targetPort }}
+      {{- if .Values.centralStorage.serviceMonitor.interval }}
+      interval: {{ .Values.centralStorage.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.centralStorage.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.centralStorage.serviceMonitor.scrapeTimeout }}
+      {{- end }}
   namespaceSelector:
     matchNames:
-    - {{ .Release.Namespace | quote }}
+      - {{ $namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ .Release.Name }}
+      app.kubernetes.io/version: {{ $appVersion }}
+      app.kubernetes.io/name: {{ $service.name }}
+      app.kubernetes.io/managed-by: {{ $releaseService }}
+      app.kubernetes.io/instance: {{ $releaseName }}
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/freeleaps/helm-pkg/centralStorage/values.prod.yaml b/freeleaps/helm-pkg/centralStorage/values.prod.yaml
index dc290d35..01d6d8a2 100644
--- a/freeleaps/helm-pkg/centralStorage/values.prod.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.prod.yaml
@@ -45,7 +45,6 @@ centralStorage:
         terminationGracePeriodSeconds: 30
   serviceMonitor:
     enabled: true
-    port: 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 2f0b2fe8..af6e9215 100644
--- a/freeleaps/helm-pkg/centralStorage/values.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.yaml
@@ -25,7 +25,6 @@ central-storage:
   probes: {}
   serviceMonitor:
     enabled: false
-    port: 8005
     labels: {}
     namespace: ""
     internal: 30s
diff --git a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
index 76289ed1..1c83d666 100644
--- a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
@@ -1,32 +1,43 @@
-{{- if .Values.content.serviceMonitor.enabled }}
+{{ $namespace := .Release.Namespace }}
+{{ $appVersion := .Chart.AppVersion | quote }}
+{{ $releaseService := .Release.Service }}
+{{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.content.serviceMonitor.enabled }}
+
+{{- if $serviceMonitorEnabled }}
+{{- range $service := .Values.content.services }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-service-monitor
+  name: {{ $service.name }}-service-monitor
   namespace: {{ .Values.content.serviceMonitor.namespace }}
   labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: {{ .Release.Name }}-service-monitor
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ $appVersion }}
+    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/managed-by: {{ $releaseService }}
+    app.kubernetes.io/instance: {{ $releaseName }}
     {{- if .Values.content.serviceMonitor.labels }}
     {{- toYaml .Values.content.serviceMonitor.labels | nindent 4 }}
     {{- end }}
 spec:
   endpoints:
-  - path: /api/_/metrics
-    targetPort: {{ .Values.content.serviceMonitor.port }}
-    {{- if .Values.content.serviceMonitor.interval }}
-    interval: {{ .Values.content.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.content.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.content.serviceMonitor.scrapeTimeout }}
-    {{- end }}
+    - path: /api/_/metrics
+      targetPort: {{ $service.targetPort }}
+      {{- if .Values.content.serviceMonitor.interval }}
+      interval: {{ .Values.content.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.content.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.content.serviceMonitor.scrapeTimeout }}
+      {{- end }}
   namespaceSelector:
     matchNames:
-    - {{ .Release.Namespace | quote }}
+      - {{ $namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ .Release.Name }}
+      app.kubernetes.io/version: {{ $appVersion }}
+      app.kubernetes.io/name: {{ $service.name }}
+      app.kubernetes.io/managed-by: {{ $releaseService }}
+      app.kubernetes.io/instance: {{ $releaseName }}
+{{- end }}
 {{- 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 1d12d107..a8e4b96f 100644
--- a/freeleaps/helm-pkg/content/values.prod.yaml
+++ b/freeleaps/helm-pkg/content/values.prod.yaml
@@ -45,7 +45,6 @@ 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 9b244559..13f1060b 100644
--- a/freeleaps/helm-pkg/content/values.yaml
+++ b/freeleaps/helm-pkg/content/values.yaml
@@ -25,7 +25,6 @@ content:
   probes: {}
   serviceMonitor:
     enabled: false
-    port: 8013
     labels: {}
     namespace: ""
     internal: 30s
diff --git a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
index bf05f610..20a21673 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
@@ -1,32 +1,43 @@
-{{- if .Values.notification.serviceMonitor.enabled }}
+{{ $namespace := .Release.Namespace }}
+{{ $appVersion := .Chart.AppVersion | quote }}
+{{ $releaseService := .Release.Service }}
+{{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.notification.serviceMonitor.enabled }}
+
+{{- if $serviceMonitorEnabled }}
+{{- range $service := .Values.notification.services }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-service-monitor
+  name: {{ $service.name }}-service-monitor
   namespace: {{ .Values.notification.serviceMonitor.namespace }}
   labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: {{ .Release.Name }}-service-monitor
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ $appVersion }}
+    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/managed-by: {{ $releaseService }}
+    app.kubernetes.io/instance: {{ $releaseName }}
     {{- if .Values.notification.serviceMonitor.labels }}
     {{- toYaml .Values.notification.serviceMonitor.labels | nindent 4 }}
     {{- end }}
 spec:
   endpoints:
-  - path: /api/_/metrics
-    targetPort: {{ .Values.notification.serviceMonitor.port }}
-    {{- if .Values.notification.serviceMonitor.interval }}
-    interval: {{ .Values.notification.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.notification.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.notification.serviceMonitor.scrapeTimeout }}
-    {{- end }}
+    - path: /api/_/metrics
+      targetPort: {{ $service.targetPort }}
+      {{- if .Values.notification.serviceMonitor.interval }}
+      interval: {{ .Values.notification.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.notification.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.notification.serviceMonitor.scrapeTimeout }}
+      {{- end }}
   namespaceSelector:
     matchNames:
-    - {{ .Release.Namespace | quote }}
+      - {{ $namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ .Release.Name }}
+      app.kubernetes.io/version: {{ $appVersion }}
+      app.kubernetes.io/name: {{ $service.name }}
+      app.kubernetes.io/managed-by: {{ $releaseService }}
+      app.kubernetes.io/instance: {{ $releaseName }}
+{{- end }}
 {{- 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 6e530d45..d966f12d 100644
--- a/freeleaps/helm-pkg/notification/values.prod.yaml
+++ b/freeleaps/helm-pkg/notification/values.prod.yaml
@@ -45,7 +45,6 @@ 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 d03aeedd..bd8e1ea7 100644
--- a/freeleaps/helm-pkg/notification/values.yaml
+++ b/freeleaps/helm-pkg/notification/values.yaml
@@ -25,7 +25,6 @@ notification:
   probes: {}
   serviceMonitor:
     enabled: false
-    port: 8003
     labels: {}
     namespace: ""
     internal: 30s
diff --git a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
index cbcf3eab..db5925c0 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
@@ -1,32 +1,43 @@
-{{- if .Values.payment.serviceMonitor.enabled }}
+{{ $namespace := .Release.Namespace }}
+{{ $appVersion := .Chart.AppVersion | quote }}
+{{ $releaseService := .Release.Service }}
+{{ $releaseName := .Release.Name }}
+{{ $serviceMonitorEnabled := .Values.payment.serviceMonitor.enabled }}
+
+{{- if $serviceMonitorEnabled }}
+{{- range $service := .Values.payment.services }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Release.Name }}-service-monitor
+  name: {{ $service.name }}-service-monitor
   namespace: {{ .Values.payment.serviceMonitor.namespace }}
   labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: {{ .Release.Name }}-service-monitor
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ $appVersion }}
+    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/managed-by: {{ $releaseService }}
+    app.kubernetes.io/instance: {{ $releaseName }}
     {{- if .Values.payment.serviceMonitor.labels }}
     {{- toYaml .Values.payment.serviceMonitor.labels | nindent 4 }}
     {{- end }}
 spec:
   endpoints:
-  - path: /api/_/metrics
-    targetPort: {{ .Values.payment.serviceMonitor.port }}
-    {{- if .Values.payment.serviceMonitor.interval }}
-    interval: {{ .Values.payment.serviceMonitor.interval }}
-    {{- end }}
-    {{- if .Values.payment.serviceMonitor.scrapeTimeout }}
-    scrapeTimeout: {{ .Values.payment.serviceMonitor.scrapeTimeout }}
-    {{- end }}
+    - path: /api/_/metrics
+      targetPort: {{ $service.targetPort }}
+      {{- if .Values.payment.serviceMonitor.interval }}
+      interval: {{ .Values.payment.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.payment.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.payment.serviceMonitor.scrapeTimeout }}
+      {{- end }}
   namespaceSelector:
     matchNames:
-    - {{ .Release.Namespace | quote }}
+      - {{ $namespace | quote }}
   selector:
     matchLabels:
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ .Release.Name }}
+      app.kubernetes.io/version: {{ $appVersion }}
+      app.kubernetes.io/name: {{ $service.name }}
+      app.kubernetes.io/managed-by: {{ $releaseService }}
+      app.kubernetes.io/instance: {{ $releaseName }}
+{{- end }}
 {{- 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 0d179544..23919fdb 100644
--- a/freeleaps/helm-pkg/payment/values.prod.yaml
+++ b/freeleaps/helm-pkg/payment/values.prod.yaml
@@ -45,7 +45,6 @@ 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 d844e5fd..5863829f 100644
--- a/freeleaps/helm-pkg/payment/values.yaml
+++ b/freeleaps/helm-pkg/payment/values.yaml
@@ -25,7 +25,6 @@ payment:
   probes: {}
   serviceMonitor:
     enabled: false
-    port: 8006
     labels: {}
     namespace: ""
     internal: 30s