diff --git a/base-values/commons.yaml b/base-values/commons.yaml
index 8ab47c7..68f582d 100644
--- a/base-values/commons.yaml
+++ b/base-values/commons.yaml
@@ -14,6 +14,7 @@ commons:
   ingress:
     domain: "wrenix.eu"
     annotations:
+      cert-manager.io/cluster-issuer: letsencrypt-prod
 
   grafana:
     datasource:
diff --git a/infra-certificates/templates/certmanager/cluster-issuer/letsencrypt-prod.yaml b/infra-certificates/templates/certmanager/cluster-issuer/letsencrypt-prod.yaml
index 51ba026..6d05071 100644
--- a/infra-certificates/templates/certmanager/cluster-issuer/letsencrypt-prod.yaml
+++ b/infra-certificates/templates/certmanager/cluster-issuer/letsencrypt-prod.yaml
@@ -20,7 +20,7 @@ spec:
                   "ingress.kubernetes.io/ssl-redirect": "false"
                   "nginx.org/redirect-to-https": "false"
                   "traefik.ingress.kubernetes.io/router.entrypoints": "web"
-                  {{- with .Values.commons.ingress.annotations }}
+                  {{- with (omit .Values.commons.ingress.annotations "cert-manager.io/cluster-issuer" "cert-manager.io/issuer") }}
                   {{- toYaml . | nindent 16 }}
                   {{- end }}
 {{- end }}