diff --git a/charts/eck-resources/templates/elasticsearch.yaml b/charts/eck-resources/templates/elasticsearch.yaml
index 6a833ed..027bdf9 100644
--- a/charts/eck-resources/templates/elasticsearch.yaml
+++ b/charts/eck-resources/templates/elasticsearch.yaml
@@ -1,8 +1,9 @@
-{{- if .Values.enabled }}
+# elasticsearch.yaml
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch-{{ .Values.env }}
+  namespace: monitoring
 spec:
   version: 8.12.0
   nodeSets:
@@ -19,4 +20,3 @@ spec:
             resources:
               requests:
                 storage: 100Gi
-{{- end }}
\ No newline at end of file
diff --git a/charts/eck-resources/templates/kibana-ingress.yaml b/charts/eck-resources/templates/kibana-ingress.yaml
index a30f3b0..f5c1cc3 100644
--- a/charts/eck-resources/templates/kibana-ingress.yaml
+++ b/charts/eck-resources/templates/kibana-ingress.yaml
@@ -1,16 +1,19 @@
-{{- if .Values.enabled }}
+# ingress.yaml (Kibana)
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: kibana-{{ .Values.env }}-ing
+  name: kibana-{{ .Values.env }}
   namespace: monitoring
   annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
+    kubernetes.io/ingress.class: traefik
+    # if behind Cloudflare, strongly recommended to disable cache for bundles:
+    traefik.ingress.kubernetes.io/browser-xss-filter: "true"
 spec:
-  ingressClassName: traefik
+  tls:
+    - hosts: [kibana.dvirlabs.com]
+      secretName: kibana-tls
   rules:
-    - host: {{ .Values.host }}
+    - host: kibana.dvirlabs.com
       http:
         paths:
           - path: /
@@ -20,4 +23,3 @@ spec:
                 name: kibana-{{ .Values.env }}-kb-http
                 port:
                   number: 5601
-{{- end }}
\ No newline at end of file
diff --git a/charts/eck-resources/templates/kibana.yaml b/charts/eck-resources/templates/kibana.yaml
index 5f1c14a..cb65431 100644
--- a/charts/eck-resources/templates/kibana.yaml
+++ b/charts/eck-resources/templates/kibana.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.enabled }}
+# kibana.yaml
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
@@ -8,16 +8,20 @@ spec:
   version: 8.12.0
   count: 1
   elasticsearchRef:
-    name: elasticsearch-{{ .Values.env }}
+    name: elasticsearch-{{ .Values.env }}   # same ns: monitoring
   config:
+    # set correct external URL for Ingress
+    server.publicBaseUrl: "https://kibana.dvirlabs.com"
+    # if you use a path like /kibana, also set:
+    # server.basePath: "/kibana"
+    # server.rewriteBasePath: true
     xpack.security.authc.providers:
       basic.basic1:
         order: 0
   http:
     tls:
       selfSignedCertificate:
-        disabled: true
+        disabled: true            # Ingress terminates TLS
     service:
       spec:
         type: ClusterIP
-{{- end }}
\ No newline at end of file