diff --git a/config/default/templates/mobene-uba-export/service.yml b/config/default/templates/mobene-uba-export/service.yml
index 20036a2..e16191c 100644
--- a/config/default/templates/mobene-uba-export/service.yml
+++ b/config/default/templates/mobene-uba-export/service.yml
@@ -14,4 +14,4 @@ spec:
     - port: 8081
       targetPort: 8081
       protocol: TCP
-      name: metrics
+      name: http-metrics
diff --git a/config/default/templates/smardigo-ocr/service.yml b/config/default/templates/smardigo-ocr/service.yml
index a1d9d2d..f8b0f1a 100644
--- a/config/default/templates/smardigo-ocr/service.yml
+++ b/config/default/templates/smardigo-ocr/service.yml
@@ -14,4 +14,4 @@ spec:
     - port: 8081
       targetPort: 8081
       protocol: TCP
-      name: metrics
+      name: http-metrics
diff --git a/config/default/templates/smardigo-ocr/servicemonitor.yaml b/config/default/templates/smardigo-ocr/serviceMonitor.yaml
similarity index 56%
rename from config/default/templates/smardigo-ocr/servicemonitor.yaml
rename to config/default/templates/smardigo-ocr/serviceMonitor.yaml
index 731d152..b52ba4a 100644
--- a/config/default/templates/smardigo-ocr/servicemonitor.yaml
+++ b/config/default/templates/smardigo-ocr/serviceMonitor.yaml
@@ -1,18 +1,17 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  name: connect-worker
   labels:
-    serviceMonitorSelector: prometheus
-  name: prometheus
-  namespace: prometheus
+    release: {{ .Values.global.prometheus.release_label }}
 spec:
+  selector:
+    matchLabels:
+      app: connect-worker
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
   endpoints:
   - interval: 30s
-    targetPort: 8081
+    port: http-metrics
     path: /management/prometheus
-  namespaceSelector:
-    matchNames:
-    - prometheus
-  selector:
-    matchLabels:
-      operated-prometheus: "true"
\ No newline at end of file
diff --git a/config/default/templates/smardigo-sepa-exporter/service.yml b/config/default/templates/smardigo-sepa-exporter/service.yml
index dc1f14d..26a1290 100644
--- a/config/default/templates/smardigo-sepa-exporter/service.yml
+++ b/config/default/templates/smardigo-sepa-exporter/service.yml
@@ -14,4 +14,4 @@ spec:
     - port: 8081
       targetPort: 8081
       protocol: TCP
-      name: metrics
+      name: http-metrics
diff --git a/config/default/values.yaml b/config/default/values.yaml
index 1acd285..0ff05d0 100644
--- a/config/default/values.yaml
+++ b/config/default/values.yaml
@@ -23,3 +23,7 @@ mobene:
     version: 1.0.2
   
 pull_secret: harbor-pull-secret-key
+
+global:
+  prometheus:
+    release_label: prometheus