diff --git a/src/main/helm/templates/certificate.yaml b/src/main/helm/templates/certificate.yaml
index 7ac0e72801f769045b063a333c1c706f12655bae..e8e5aa03ae1fd6489e99fd6975bc4fb243a3491d 100644
--- a/src/main/helm/templates/certificate.yaml
+++ b/src/main/helm/templates/certificate.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
 spec:
-  isCA: false
   secretName: {{ .Release.Name }}-tls-secret
   privateKey:
     algorithm: ECDSA
@@ -40,4 +39,9 @@ spec:
     - key encipherment
     - key agreement
   dnsNames:
-    - "{{ .Release.Name }}-{{ include "app.baseDomain" . }}"
\ No newline at end of file
+    - "{{ .Release.Name }}-{{ include "app.baseDomain" . }}"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster.local"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}.svc"
+    - "{{ .Release.Name }}.{{ include "app.namespace" . }}"
+    - "{{ .Release.Name }}"
\ No newline at end of file
diff --git a/src/main/helm/templates/client_certificates.yaml b/src/main/helm/templates/client_certificates.yaml
index c52df70969a97c9327146158073b516d0e31cb2a..9d3575d2b844e61b6bd5aa26e283d6c961a3b777 100644
--- a/src/main/helm/templates/client_certificates.yaml
+++ b/src/main/helm/templates/client_certificates.yaml
@@ -8,7 +8,6 @@ metadata:
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
 spec:
-  isCA: false
   secretName: {{ .Release.Name }}-{{ $cn | lower }}-tls-secret
   privateKey:
     algorithm: ECDSA
diff --git a/src/test/helm/certificate_test.yaml b/src/test/helm/certificate_test.yaml
index cf78c770624db55707227add0f4efaec651a6469..2d70a8c1ad64780bf5a12ff837c3d12607a0bd58 100644
--- a/src/test/helm/certificate_test.yaml
+++ b/src/test/helm/certificate_test.yaml
@@ -64,6 +64,12 @@ tests:
           path: spec.dnsNames
           value:
             - "xta-test-server-release-name-helm.test.by.ozg-cloud.de"
+            - "xta-test-server-release-name.sh-helm-test.svc.cluster.local"
+            - "xta-test-server-release-name.sh-helm-test.svc.cluster"
+            - "xta-test-server-release-name.sh-helm-test.svc"
+            - "xta-test-server-release-name.sh-helm-test"
+            - "xta-test-server-release-name"
+
   - it: should contain default lables and component lables
     asserts:
       - equal: