diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
index bb79fb8c..98a27e08 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/servicemonitor.yaml
@@ -9,11 +9,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ $service.name }}-service-monitor
+  name: {{ $service.name }}-monitor
   namespace: {{ $service.serviceMonitor.namespace }}
   labels:
     app.kubernetes.io/version: {{ $appVersion }}
-    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/name: {{ $service.name }}-monitor
     app.kubernetes.io/managed-by: {{ $releaseService }}
     app.kubernetes.io/instance: {{ $releaseName }}
     {{- if $service.serviceMonitor.labels }}
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
index 55ff1ac4..0b9b6775 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/servicemonitor.yaml
@@ -9,11 +9,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ $service.name }}-service-monitor
+  name: {{ $service.name }}-monitor
   namespace: {{ $service.serviceMonitor.namespace }}
   labels:
     app.kubernetes.io/version: {{ $appVersion }}
-    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/name: {{ $service.name }}-monitor
     app.kubernetes.io/managed-by: {{ $releaseService }}
     app.kubernetes.io/instance: {{ $releaseName }}
     {{- if $service.serviceMonitor.labels }}
diff --git a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
index 2075c8fa..355c6fad 100644
--- a/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/servicemonitor.yaml
@@ -9,11 +9,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ $service.name }}-service-monitor
+  name: {{ $service.name }}-monitor
   namespace: {{ $service.serviceMonitor.namespace }}
   labels:
     app.kubernetes.io/version: {{ $appVersion }}
-    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/name: {{ $service.name }}-monitor
     app.kubernetes.io/managed-by: {{ $releaseService }}
     app.kubernetes.io/instance: {{ $releaseName }}
     {{- if $service.serviceMonitor.labels }}
diff --git a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
index fef1600f..fec12226 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/servicemonitor.yaml
@@ -9,11 +9,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ $service.name }}-service-monitor
+  name: {{ $service.name }}-monitor
   namespace: {{ $service.serviceMonitor.namespace }}
   labels:
     app.kubernetes.io/version: {{ $appVersion }}
-    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/name: {{ $service.name }}-monitor
     app.kubernetes.io/managed-by: {{ $releaseService }}
     app.kubernetes.io/instance: {{ $releaseName }}
     {{- if $service.serviceMonitor.labels }}
diff --git a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
index bf887405..eb86d6b6 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/servicemonitor.yaml
@@ -9,11 +9,11 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ $service.name }}-service-monitor
+  name: {{ $service.name }}-monitor
   namespace: {{ $service.serviceMonitor.namespace }}
   labels:
     app.kubernetes.io/version: {{ $appVersion }}
-    app.kubernetes.io/name: {{ $service.name }}-service-monitor
+    app.kubernetes.io/name: {{ $service.name }}-monitor
     app.kubernetes.io/managed-by: {{ $releaseService }}
     app.kubernetes.io/instance: {{ $releaseName }}
     {{- if $service.serviceMonitor.labels }}