diff --git a/freeleaps/helm-pkg/authentication/values.prod.yaml b/freeleaps/helm-pkg/authentication/values.prod.yaml
index a87a603e..c19f4ff5 100644
--- a/freeleaps/helm-pkg/authentication/values.prod.yaml
+++ b/freeleaps/helm-pkg/authentication/values.prod.yaml
@@ -43,18 +43,18 @@ authentication:
         successThreshold: 1
         failureThreshold: 3
         terminationGracePeriodSeconds: 30
-  serviceMonitor:
-    enabled: true
-    labels:
-      release: kube-prometheus-stack
-    namespace: freeleaps-monitoring-system
-    interval: 30s
-    scrapeTimeout: ""
   services:
   - name: authentication-service
     type: ClusterIP
     port: 8004
     targetPort: 8004
+    serviceMonitor:
+      enabled: true
+      labels:
+        release: kube-prometheus-stack
+      namespace: freeleaps-monitoring-system
+      interval: 30s
+      scrapeTimeout: ""
   ingresses: {}
   configs:
     tz: UTC
diff --git a/freeleaps/helm-pkg/authentication/values.yaml b/freeleaps/helm-pkg/authentication/values.yaml
index c06d4219..acfcfa19 100644
--- a/freeleaps/helm-pkg/authentication/values.yaml
+++ b/freeleaps/helm-pkg/authentication/values.yaml
@@ -23,17 +23,18 @@ authentication:
       memory: "1Gi"
   # FIXME: Wait until the developers implements the probes APIs
   probes: {}
-  serviceMonitor:
-    enabled: false
-    labels: {}
-    namespace: ""
-    internal: 30s
-    scrapeTimeout: ""
   services:
     - name: authentication-service
       type: ClusterIP
       port: 8004
       targetPort: 8004
+      serviceMonitor:
+        enabled: false
+        labels:
+          release: kube-prometheus-stack
+        namespace: freeleaps-monitoring-system
+        interval: 30s
+        scrapeTimeout: ""
   # Defaults to {}, which means doesn't have any ingress
   ingresses: {}
   configs:
diff --git a/freeleaps/helm-pkg/centralStorage/values.prod.yaml b/freeleaps/helm-pkg/centralStorage/values.prod.yaml
index 01d6d8a2..95c79bf5 100644
--- a/freeleaps/helm-pkg/centralStorage/values.prod.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.prod.yaml
@@ -43,18 +43,18 @@ centralStorage:
         successThreshold: 1
         failureThreshold: 3
         terminationGracePeriodSeconds: 30
-  serviceMonitor:
-    enabled: true
-    labels:
-      release: kube-prometheus-stack
-    namespace: freeleaps-monitoring-system
-    internal: 30s
-    scrapeTimeout: ""
   services:
   - name: central-storage-service
     type: ClusterIP
     port: 8005
     targetPort: 8005
+    serviceMonitor:
+      enabled: true
+      labels:
+        release: kube-prometheus-stack
+      namespace: freeleaps-monitoring-system
+      internal: 30s
+      scrapeTimeout: ""
   ingresses: {}
   configs:
     tz: UTC
diff --git a/freeleaps/helm-pkg/centralStorage/values.yaml b/freeleaps/helm-pkg/centralStorage/values.yaml
index af6e9215..44ab9d69 100644
--- a/freeleaps/helm-pkg/centralStorage/values.yaml
+++ b/freeleaps/helm-pkg/centralStorage/values.yaml
@@ -23,17 +23,17 @@ central-storage:
       memory: "1Gi"
   # FIXME: Wait until the developers implements the probes APIs
   probes: {}
-  serviceMonitor:
-    enabled: false
-    labels: {}
-    namespace: ""
-    internal: 30s
-    scrapeTimeout: ""
   services:
     - name: central-storage-service
       type: ClusterIP
       port: 8005
       targetPort: 8005
+      serviceMonitor:
+        enabled: false
+        labels: {}
+        namespace: ""
+        internal: 30s
+        scrapeTimeout: ""
   # Defaults to {}, which means doesn't have any ingress
   ingresses: {}
   configs:
diff --git a/freeleaps/helm-pkg/content/values.prod.yaml b/freeleaps/helm-pkg/content/values.prod.yaml
index a8e4b96f..c9369371 100644
--- a/freeleaps/helm-pkg/content/values.prod.yaml
+++ b/freeleaps/helm-pkg/content/values.prod.yaml
@@ -43,18 +43,18 @@ content:
         successThreshold: 1
         failureThreshold: 3
         terminationGracePeriodSeconds: 30
-  serviceMonitor:
-    enabled: true
-    labels:
-      release: kube-prometheus-stack
-    namespace: freeleaps-monitoring-system
-    internal: 30s
-    scrapeTimeout: ""
   services:
   - name: content-service
     type: ClusterIP
     port: 8013
     targetPort: 8013
+    serviceMonitor:
+      enabled: true
+      labels:
+        release: kube-prometheus-stack
+      namespace: freeleaps-monitoring-system
+      internal: 30s
+      scrapeTimeout: ""
   ingresses: {}
   configs:
     tz: UTC
diff --git a/freeleaps/helm-pkg/content/values.yaml b/freeleaps/helm-pkg/content/values.yaml
index 13f1060b..02aef249 100644
--- a/freeleaps/helm-pkg/content/values.yaml
+++ b/freeleaps/helm-pkg/content/values.yaml
@@ -23,17 +23,17 @@ content:
       memory: "1Gi"
   # FIXME: Wait until the developers implements the probes APIs
   probes: {}
-  serviceMonitor:
-    enabled: false
-    labels: {}
-    namespace: ""
-    internal: 30s
-    scrapeTimeout: ""
   services:
     - name: content-service
       type: ClusterIP
       port: 8013
       targetPort: 8013
+      serviceMonitor:
+        enabled: false
+        labels: {}
+        namespace: ""
+        internal: 30s
+        scrapeTimeout: ""
   # Defaults to {}, which means doesn't have any ingress
   ingresses: {}
   configs:
diff --git a/freeleaps/helm-pkg/notification/values.prod.yaml b/freeleaps/helm-pkg/notification/values.prod.yaml
index d966f12d..1011cb35 100644
--- a/freeleaps/helm-pkg/notification/values.prod.yaml
+++ b/freeleaps/helm-pkg/notification/values.prod.yaml
@@ -43,18 +43,18 @@ notification:
         successThreshold: 1
         failureThreshold: 3
         terminationGracePeriodSeconds: 30
-  serviceMonitor:
-    enabled: true
-    labels:
-      release: kube-prometheus-stack
-    namespace: freeleaps-monitoring-system
-    internal: 30s
-    scrapeTimeout: ''
   services:
   - name: notification-service
     type: ClusterIP
     port: 8003
     targetPort: 8003
+    serviceMonitor:
+      enabled: true
+      labels:
+        release: kube-prometheus-stack
+      namespace: freeleaps-monitoring-system
+      internal: 30s
+      scrapeTimeout: ''
   ingresses: {}
   configs:
     tz: UTC
diff --git a/freeleaps/helm-pkg/notification/values.yaml b/freeleaps/helm-pkg/notification/values.yaml
index bd8e1ea7..c0c1291f 100644
--- a/freeleaps/helm-pkg/notification/values.yaml
+++ b/freeleaps/helm-pkg/notification/values.yaml
@@ -23,17 +23,17 @@ notification:
       memory: "1Gi"
   # FIXME: Wait until the developers implements the probes APIs
   probes: {}
-  serviceMonitor:
-    enabled: false
-    labels: {}
-    namespace: ""
-    internal: 30s
-    scrapeTimeout: ""
   services:
     - name: notification-service
       type: ClusterIP
       port: 8003
       targetPort: 8003
+      serviceMonitor:
+        enabled: false
+        labels: {}
+        namespace: ""
+        internal: 30s
+        scrapeTimeout: ""
   # Defaults to {}, which means doesn't have any ingress
   ingresses: {}
   configs:
diff --git a/freeleaps/helm-pkg/payment/values.prod.yaml b/freeleaps/helm-pkg/payment/values.prod.yaml
index 23919fdb..c0ee65cb 100644
--- a/freeleaps/helm-pkg/payment/values.prod.yaml
+++ b/freeleaps/helm-pkg/payment/values.prod.yaml
@@ -43,18 +43,18 @@ payment:
         successThreshold: 1
         failureThreshold: 3
         terminationGracePeriodSeconds: 30
-  serviceMonitor:
-    enabled: true
-    labels:
-      release: kube-prometheus-stack
-    namespace: freeleaps-monitoring-system
-    internal: 30s
-    scrapeTimeout: ''
   services:
   - name: payment-service
     type: ClusterIP
     port: 8006
     targetPort: 8006
+    serviceMonitor:
+      enabled: true
+      labels:
+        release: kube-prometheus-stack
+      namespace: freeleaps-monitoring-system
+      internal: 30s
+      scrapeTimeout: ''
   ingresses: {}
   configs:
     tz: UTC
diff --git a/freeleaps/helm-pkg/payment/values.yaml b/freeleaps/helm-pkg/payment/values.yaml
index 5863829f..7fdba84a 100644
--- a/freeleaps/helm-pkg/payment/values.yaml
+++ b/freeleaps/helm-pkg/payment/values.yaml
@@ -23,17 +23,17 @@ payment:
       memory: "1Gi"
   # FIXME: Wait until the developers implements the probes APIs
   probes: {}
-  serviceMonitor:
-    enabled: false
-    labels: {}
-    namespace: ""
-    internal: 30s
-    scrapeTimeout: ""
   services:
     - name: payment-service
       type: ClusterIP
       port: 8006
       targetPort: 8006
+      serviceMonitor:
+        enabled: false
+        labels: {}
+        namespace: ""
+        internal: 30s
+        scrapeTimeout: ""
   # Defaults to {}, which means doesn't have any ingress
   ingresses: {}
   configs: