diff --git a/charts/kubezero-logging/templates/eck-operator.yaml b/charts/kubezero-logging/templates/eck-operator.yaml
index 54bb221..055d1c3 100644
--- a/charts/kubezero-logging/templates/eck-operator.yaml
+++ b/charts/kubezero-logging/templates/eck-operator.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.es.nodeSets }}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -3056,3 +3057,4 @@ spec:
         secret:
           defaultMode: 420
           secretName: elastic-webhook-server-cert
+{{- end }}
diff --git a/charts/kubezero-logging/templates/kibana.yaml b/charts/kubezero-logging/templates/kibana.yaml
index f80539a..1a24230 100644
--- a/charts/kubezero-logging/templates/kibana.yaml
+++ b/charts/kubezero-logging/templates/kibana.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.kibana }}
+{{- if .Values.es.nodeSets }}
+# Only deploy Kibana if we have local ES cluster
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
diff --git a/charts/kubezero-logging/templates/secrets.yaml b/charts/kubezero-logging/templates/secrets.yaml
index 7ba0fbb..6fe9151 100644
--- a/charts/kubezero-logging/templates/secrets.yaml
+++ b/charts/kubezero-logging/templates/secrets.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.es.nodeSets }}
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -12,3 +13,4 @@ metadata:
 data:
   username: {{ "elastic" | b64enc | quote }}
   elastic: {{ .Values.elastic_password | b64enc | quote }}
+{{- end }}
diff --git a/charts/kubezero-logging/values-no-eck.yaml b/charts/kubezero-logging/values-no-eck.yaml
new file mode 100644
index 0000000..ef87eed
--- /dev/null
+++ b/charts/kubezero-logging/values-no-eck.yaml
@@ -0,0 +1,6 @@
+# Default values for zdt-logging.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+kibana: 
+  count: 0