diff --git a/charts/eck-resources/my-values/values-int.yaml b/charts/eck-resources/my-values/values-int.yaml
new file mode 100644
index 0000000..bbd66ba
--- /dev/null
+++ b/charts/eck-resources/my-values/values-int.yaml
@@ -0,0 +1,3 @@
+enabled: false
+env: int
+host: kibana-int.dvirlabs.com
\ No newline at end of file
diff --git a/charts/eck-resources/my-values/values-int.yaml.disabled b/charts/eck-resources/my-values/values-int.yaml.disabled
deleted file mode 100644
index 00ba9ba..0000000
--- a/charts/eck-resources/my-values/values-int.yaml.disabled
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# env: int
-# host: kibana-int.dvirlabs.com
\ No newline at end of file
diff --git a/charts/eck-resources/templates/elasticsearch.yaml b/charts/eck-resources/templates/elasticsearch.yaml
index d70a586..200f5ba 100644
--- a/charts/eck-resources/templates/elasticsearch.yaml
+++ b/charts/eck-resources/templates/elasticsearch.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
@@ -18,3 +19,4 @@ spec:
             resources:
               requests:
                 storage: 5Gi
+{{- 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 8952bfd..a30f3b0 100644
--- a/charts/eck-resources/templates/kibana-ingress.yaml
+++ b/charts/eck-resources/templates/kibana-ingress.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -19,3 +20,4 @@ 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 c71f6b0..5f1c14a 100644
--- a/charts/eck-resources/templates/kibana.yaml
+++ b/charts/eck-resources/templates/kibana.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
@@ -19,3 +20,4 @@ spec:
     service:
       spec:
         type: ClusterIP
+{{- end }}
\ No newline at end of file