diff --git a/helm/zeno/templates/cert-issuer.yaml b/helm/zeno/templates/cert-issuer.yaml
index 9cb50e1..0283b33 100644
--- a/helm/zeno/templates/cert-issuer.yaml
+++ b/helm/zeno/templates/cert-issuer.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.config.enable_tls }}
+{{- if .Values.config.create_cert_manager_issuer }}
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
diff --git a/helm/zeno/values-dev.yaml b/helm/zeno/values-dev.yaml
index 99e3843..f560d3a 100644
--- a/helm/zeno/values-dev.yaml
+++ b/helm/zeno/values-dev.yaml
@@ -1,5 +1,7 @@
 config:
   enable_tls: true
+  # we will use the existing cluster issuer from default namespace
+  create_cert_manager_issuer: false
 
 secrets:
   langfuse:
diff --git a/helm/zeno/values.yaml b/helm/zeno/values.yaml
index 27cd5ec..af0c24f 100644
--- a/helm/zeno/values.yaml
+++ b/helm/zeno/values.yaml
@@ -1,5 +1,6 @@
 config:
   enable_tls: true
+  create_cert_manager_issuer: true
 
 secrets:
   langfuse: