diff --git a/charts/s3gw/templates/certificate.yaml b/charts/s3gw/templates/certificate.yaml
index aa0f796..840277a 100644
--- a/charts/s3gw/templates/certificate.yaml
+++ b/charts/s3gw/templates/certificate.yaml
@@ -33,6 +33,6 @@ spec:
     - '*.{{ include "s3gw.serviceName" . }}.{{ .Release.Namespace }}.{{ .Values.privateDomain }}'
   issuerRef:
     kind: ClusterIssuer
-    name: {{ .Release.Name }}-{{ .Release.Namespace }}-issuer
+    name: {{ .Release.Name }}-{{ .Release.Namespace }}-s3gw-issuer
   secretName: {{ .Release.Name }}-{{ .Release.Namespace }}-cluster-ip-tls
 {{- end }}
diff --git a/charts/s3gw/templates/ingress-traefik.yaml b/charts/s3gw/templates/ingress-traefik.yaml
index fff133c..5e81516 100644
--- a/charts/s3gw/templates/ingress-traefik.yaml
+++ b/charts/s3gw/templates/ingress-traefik.yaml
@@ -12,12 +12,12 @@ metadata:
     traefik.ingress.kubernetes.io/router.tls: "true"
     traefik.ingress.kubernetes.io/router.middlewares:
       '{{ .Release.Namespace }}-{{ include "s3gw.CORSMiddlewareName" . }}@kubernetescrd'
-    cert-manager.io/cluster-issuer: {{ default .Values.tlsIssuer .Values.customTlsIssuer | quote }}
+    cert-manager.io/cluster-issuer: {{ .Release.Name }}-{{ .Release.Namespace }}-{{ .Values.tlsIssuer }}
 spec:
   tls:
     - hosts:
         - '{{ include "s3gw.serviceName" . }}.{{ .Values.publicDomain }}'
-        - '*.{{ include "s3gw.serviceName" . }}.{{ .Values.publicDomain }}'
+#        - '*.{{ include "s3gw.serviceName" . }}.{{ .Values.publicDomain }}'
       secretName: s3gw-ingress-tls
   rules:
     - host: '{{ include "s3gw.serviceName" . }}.{{ .Values.publicDomain }}'
@@ -88,7 +88,7 @@ metadata:
     traefik.ingress.kubernetes.io/router.tls: "true"
     traefik.ingress.kubernetes.io/router.middlewares:
       '{{ .Release.Namespace }}-{{ include "s3gw.CORSMiddlewareName" . }}@kubernetescrd'
-    cert-manager.io/cluster-issuer: {{ default .Values.tlsIssuer .Values.customTlsIssuer | quote }}
+    cert-manager.io/cluster-issuer: {{ .Release.Name }}-{{ .Release.Namespace }}-{{ .Values.tlsIssuer }}
 spec:
   tls:
     - hosts:
diff --git a/charts/s3gw/templates/tls-issuer.yaml b/charts/s3gw/templates/tls-issuer.yaml
index e9ae249..21f9db0 100644
--- a/charts/s3gw/templates/tls-issuer.yaml
+++ b/charts/s3gw/templates/tls-issuer.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.useCertManager }}
-{{- if eq .Values.tlsIssuer "s3gw-issuer" }}
 ---
 # Self-signed issuer
 apiVersion: cert-manager.io/v1
@@ -15,19 +14,20 @@ spec:
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: {{ .Release.Name }}-{{ .Release.Namespace }}-issuer
+  name: {{ .Release.Name }}-{{ .Release.Namespace }}-s3gw-issuer
   labels:
 {{ include "s3gw.labels" . | indent 4}}
 spec:
   ca:
     secretName: {{ .Release.Name }}-{{ .Release.Namespace }}-ca-root
-{{- else if eq .Values.tlsIssuer "s3gw-letsencrypt-issuer" }}
+
+{{- if eq .Values.tlsIssuer "s3gw-letsencrypt-issuer" }}
 ---
 # Let's encrypt production issuer
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: {{ .Release.Name }}-{{ .Release.Namespace }}-letsencrypt-issuer
+  name: {{ .Release.Name }}-{{ .Release.Namespace }}-s3gw-letsencrypt-issuer
   labels:
 {{ include "s3gw.labels" . | indent 4}}
 spec:
@@ -40,10 +40,6 @@ spec:
     solvers:
     - http01:
         ingress:
-          ingressTemplate:
-            metadata:
-              annotations:
-                traefik.ingress.kubernetes.io/router.entrypoints: websecure
-                traefik.ingress.kubernetes.io/router.tls: "true"
+          ingressClassName: traefik
 {{- end }}
 {{- end }}