diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
index 21d8ae6e..4f72653a 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
@@ -2,10 +2,9 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
-{{ $serviceMonitorEnabled := .Values.authentication.serviceMonitor.enabled }}
 
-{{- if $serviceMonitorEnabled }}
 {{- range $service := .Values.authentication.services }}
+{{- if $service.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
index 4ccdf4ea..d4e55380 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
@@ -2,10 +2,9 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
-{{ $serviceMonitorEnabled := .Values.centralStorage.serviceMonitor.enabled }}
 
-{{- if $serviceMonitorEnabled }}
 {{- range $service := .Values.centralStorage.services }}
+{{- if $service.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
diff --git a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
index 1c83d666..0c219dcd 100644
--- a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
@@ -2,10 +2,9 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
-{{ $serviceMonitorEnabled := .Values.content.serviceMonitor.enabled }}
 
-{{- if $serviceMonitorEnabled }}
 {{- range $service := .Values.content.services }}
+{{- if $service.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
diff --git a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
index 20a21673..2f13770e 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
@@ -2,10 +2,9 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
-{{ $serviceMonitorEnabled := .Values.notification.serviceMonitor.enabled }}
 
-{{- if $serviceMonitorEnabled }}
 {{- range $service := .Values.notification.services }}
+{{- if $service.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
diff --git a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
index db5925c0..20ae3af7 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
@@ -2,10 +2,9 @@
 {{ $appVersion := .Chart.AppVersion | quote }}
 {{ $releaseService := .Release.Service }}
 {{ $releaseName := .Release.Name }}
-{{ $serviceMonitorEnabled := .Values.payment.serviceMonitor.enabled }}
 
-{{- if $serviceMonitorEnabled }}
 {{- range $service := .Values.payment.services }}
+{{- if $service.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor