diff --git a/src/main/helm/templates/certificate.yaml b/src/main/helm/templates/certificate.yaml
index 5e4bf27dd28e5ff5a208d341bb7cef9641c8cc90..02e60de385e513b9fd1450e9a48876b3cf5b8d56 100644
--- a/src/main/helm/templates/certificate.yaml
+++ b/src/main/helm/templates/certificate.yaml
@@ -34,11 +34,11 @@ spec:
     kind: Issuer
   duration: 8760h0m0s
   renewBefore: 720h0m0s
-  commonName: "user-manager-svc"
+  commonName: {{ include "app.name" . }}
   dnsNames:
-    - "*.user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
-    - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
-    - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster"
-    - "user-manager-svc.{{ include "app.namespace" . }}.svc"
-    - "user-manager-svc.{{ include "app.namespace" . }}"
-    - "user-manager-svc"
\ No newline at end of file
+    - "*.{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc.cluster.local"
+    - "{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc.cluster.local"
+    - "{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc.cluster"
+    - "{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc"
+    - "{{ include "app.name" . }}.{{ include "app.namespace" . }}"
+    - "{{ include "app.name" . }}"
\ No newline at end of file
diff --git a/src/test/helm/certificate_test.yaml b/src/test/helm/certificate_test.yaml
index 2c0be827e317bb7d2a98dba2993cab8feb86d2c5..ac111fb2284e8d718f0c08598fa3170472089444 100644
--- a/src/test/helm/certificate_test.yaml
+++ b/src/test/helm/certificate_test.yaml
@@ -70,24 +70,24 @@ tests:
     asserts:
       - equal:
           path: spec.commonName
-          value: "user-manager-svc"
+          value: "user-manager"
   - it: should have dnsNames
     asserts:
      - equal:
           path: spec.dnsNames[0]
-          value: "*.user-manager-svc.sh-helm-test.svc.cluster.local"
+          value: "*.user-manager.sh-helm-test.svc.cluster.local"
      - equal:
           path: spec.dnsNames[1]
-          value: "user-manager-svc.sh-helm-test.svc.cluster.local"
+          value: "user-manager.sh-helm-test.svc.cluster.local"
      - equal:
           path: spec.dnsNames[2]
-          value: "user-manager-svc.sh-helm-test.svc.cluster"
+          value: "user-manager.sh-helm-test.svc.cluster"
      - equal:
           path: spec.dnsNames[3]
-          value: "user-manager-svc.sh-helm-test.svc"
+          value: "user-manager.sh-helm-test.svc"
      - equal:
           path: spec.dnsNames[4]
-          value: "user-manager-svc.sh-helm-test"
+          value: "user-manager.sh-helm-test"
      - equal:
           path: spec.dnsNames[5]
-          value: "user-manager-svc"
\ No newline at end of file
+          value: "user-manager"
\ No newline at end of file