diff --git a/smardigo/templates/sepa-exporter/_helpers.tpl b/smardigo/templates/sepa-exporter/_helpers.tpl
new file mode 100644
index 0000000..b6b22b7
--- /dev/null
+++ b/smardigo/templates/sepa-exporter/_helpers.tpl
@@ -0,0 +1,7 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Create name for the service.
+*/}}
+{{- define "service.name" -}}
+{{- default "uba-exporter" -}}
+{{- end -}}
\ No newline at end of file
diff --git a/smardigo/templates/sepa-exporter/deployment.yml b/smardigo/templates/sepa-exporter/deployment.yml
index b6cc113..42a4fdf 100644
--- a/smardigo/templates/sepa-exporter/deployment.yml
+++ b/smardigo/templates/sepa-exporter/deployment.yml
@@ -2,20 +2,20 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "sepa-exporter"
+  name: "{{ include "service.name" $ }}"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: "sepa-exporter"
+      app: "{{ include "service.name" $ }}"
   template:
     metadata:
       labels:
-        app: "sepa-exporter"
+        app: "{{ include "service.name" $ }}"
     spec:
     spec:
       containers:
-      - name: "sepa-exporter"
+      - name: "{{ include "service.name" $ }}"
         image: "{{ .Values.harbor.host.name }}/{{ .Values.sepaExporter.image.name }}:{{ .Values.sepaExporter.image.version }}"
         imagePullPolicy: Always
         env:
@@ -34,7 +34,7 @@ spec:
         - name: SMA_WORKFLOW_REST_AUTH_TOKEN
           valueFrom:
             secretKeyRef:
-              name: "sepa-exporter-secrets"
+              name: "{{ include "service.name" $ }}-secrets"
               key: SMA_WORKFLOW_AUTH_TOKEN
         - name: SMA_DOCUMENT_REST_BASE_PATH
           value: "{{ .Values.smardigo.document.host }}"
@@ -45,7 +45,7 @@ spec:
         - name: SMA_DOCUMENT_REST_AUTH_TOKEN
           valueFrom:
             secretKeyRef:
-              name: "sepa-exporter-secrets"
+              name: "{{ include "service.name" $ }}-secrets"
               key: SMA_DOCUMENT_AUTH_TOKEN
         ports:
         - containerPort: 8080
diff --git a/smardigo/templates/sepa-exporter/monitoring.yml b/smardigo/templates/sepa-exporter/monitoring.yml
index 7a047b5..0c0252a 100644
--- a/smardigo/templates/sepa-exporter/monitoring.yml
+++ b/smardigo/templates/sepa-exporter/monitoring.yml
@@ -2,13 +2,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: sepa-exporter
+  name: "{{ include "service.name" $ }}"
   labels:
-    release: prometheus
+    release: "prometheus"
 spec:
   selector:
     matchLabels:
-      app: sepa-exporter
+      app: "{{ include "service.name" $ }}"
   namespaceSelector:
     matchNames:
       - "{{ .Release.Namespace }}"
diff --git a/smardigo/templates/sepa-exporter/secret.yml b/smardigo/templates/sepa-exporter/secret.yml
index 6d466d1..a6964be 100644
--- a/smardigo/templates/sepa-exporter/secret.yml
+++ b/smardigo/templates/sepa-exporter/secret.yml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "sepa-exporter-secrets"
+  name: "{{ include "service.name" $ }}-secrets"
 data:
   SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.sepaExporter.workflow.api_token | b64enc }}"
   SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.sepaExporter.document.api_token | b64enc }}"
diff --git a/smardigo/templates/sepa-exporter/service.yml b/smardigo/templates/sepa-exporter/service.yml
index a8a5568..32c3dfa 100644
--- a/smardigo/templates/sepa-exporter/service.yml
+++ b/smardigo/templates/sepa-exporter/service.yml
@@ -2,12 +2,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "sepa-exporter"
+  name: "{{ include "service.name" $ }}"
   labels:
-    app: "sepa-exporter"
+    app: "{{ include "service.name" $ }}"
 spec:
   selector:
-    app: "sepa-exporter"
+    app: "{{ include "service.name" $ }}"
   ports:
     - port: 8080
       targetPort: 8080
diff --git a/smardigo/templates/uba-export/deployment.yml b/smardigo/templates/uba-export/deployment.yml
index 8f3a625..0ff9073 100644
--- a/smardigo/templates/uba-export/deployment.yml
+++ b/smardigo/templates/uba-export/deployment.yml
@@ -21,7 +21,6 @@ spec:
         env:
         - name: SPRING_PROFILES_INCLUDE
           value: "prod,swagger"
-
         - name: EXTERNAL_TASK_UBA_EXPORT_MAX_RETRIES
           value: "5"
         - name: SMA_EXTERNAL_TASK_SCHEDULE_INTERVAL