diff --git a/charts/loghouse/Chart.yaml b/charts/loghouse/Chart.yaml
index 6d7e74d..103bdcc 100644
--- a/charts/loghouse/Chart.yaml
+++ b/charts/loghouse/Chart.yaml
@@ -1,6 +1,6 @@
 name: loghouse
-version: 0.2.3
-appVersion: 0.2.3
+# helm package override version on release. Do not change it in master.
+version: latest
 description: Loghouse (Fluentd, Clickhouse, Tabix, Loghouse) for collect and prepare
              logs for Kubernetes cluster.
 keywords:
@@ -20,4 +20,3 @@ maintainers:
   email: sergey.gnuskov@flant.com
 - name: Ivan Mikheykin
   email: ivan.mikheykin@flant.com
-
diff --git a/charts/loghouse/templates/_helpers.tpl b/charts/loghouse/templates/_helpers.tpl
index 525e5e2..2df3044 100644
--- a/charts/loghouse/templates/_helpers.tpl
+++ b/charts/loghouse/templates/_helpers.tpl
@@ -11,12 +11,13 @@ CronJob api version
 
 
 {{/*
-Images version. This version can be set from cli: --set app.version=master.
+Images version. This version can be set from cli: --set version=latest or --set version=0.2.1
+Chart.Version is set to latest in master branch. helm package rewrite it to tag value for releases.
 */}}
 {{- define "app.version" -}}
-{{- if .Values.app.version -}}
-{{- .Values.app.version -}}
+{{- if .Values.version -}}
+{{- .Values.version -}}
 {{- else -}}
-{{- .Chart.AppVersion -}}
+{{- .Chart.Version -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/loghouse/templates/clickhouse/clickhouse-ingress.yaml b/charts/loghouse/templates/clickhouse/clickhouse-ingress.yaml
index 06924dd..ea7a314 100644
--- a/charts/loghouse/templates/clickhouse/clickhouse-ingress.yaml
+++ b/charts/loghouse/templates/clickhouse/clickhouse-ingress.yaml
@@ -27,6 +27,6 @@ spec:
   tls:
   - hosts:
     - {{ .Values.ingress.clickhouse.host }}
-    secretName: {{ .Values.ingress.clickhouse.tls_secret_name}}se
+    secretName: {{ .Values.ingress.clickhouse.tls_secret_name}}
 {{- end }}
 {{- end }}
diff --git a/charts/loghouse/templates/loghouse/loghouse-init-db.yaml b/charts/loghouse/templates/loghouse/loghouse-init-db.yaml
index 234df7a..25e37e7 100644
--- a/charts/loghouse/templates/loghouse/loghouse-init-db.yaml
+++ b/charts/loghouse/templates/loghouse/loghouse-init-db.yaml
@@ -7,7 +7,7 @@ metadata:
     "helm.sh/hook": post-install
     "helm.sh/weight": "-5"
 spec:
-  activeDeadlineSeconds: 300
+  activeDeadlineSeconds: 600
   template:
     metadata:
       name: {{ .Chart.Name }}-init-db
diff --git a/charts/loghouse/templates/loghouse/loghouse-init-tables.yaml b/charts/loghouse/templates/loghouse/loghouse-init-tables.yaml
index c6a55c7..544aa97 100644
--- a/charts/loghouse/templates/loghouse/loghouse-init-tables.yaml
+++ b/charts/loghouse/templates/loghouse/loghouse-init-tables.yaml
@@ -7,7 +7,7 @@ metadata:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/weight": "5"
 spec:
-  activeDeadlineSeconds: 300
+  activeDeadlineSeconds: 600
   template:
     metadata:
       name: {{ .Chart.Name }}-init-tables
diff --git a/charts/loghouse/templates/tabix/tabix-ingress.yaml b/charts/loghouse/templates/tabix/tabix-ingress.yaml
index 955ac1b..cda8df9 100644
--- a/charts/loghouse/templates/tabix/tabix-ingress.yaml
+++ b/charts/loghouse/templates/tabix/tabix-ingress.yaml
@@ -30,6 +30,6 @@ spec:
   tls:
   - hosts:
     - {{ .Values.ingress.tabix.host }}
-    secretName: {{ .Values.tabix.tls_secret_name }}
+    secretName: {{ .Values.ingress.tabix.tls_secret_name }}
 {{- end }}
 {{- end }}
diff --git a/charts/loghouse/values.yaml b/charts/loghouse/values.yaml
index 749c068..771e6d9 100644
--- a/charts/loghouse/values.yaml
+++ b/charts/loghouse/values.yaml
@@ -1,3 +1,8 @@
+# Override images tag with --set version=...
+# Chart.Version is used if no --set version.
+# Chart.Version is set to latest in master branch. helm package rewrite it to tag value for releases.
+# version: latest|0.2.3|0.2.2
+
 # Basic-auth string. Generated by command:
 # echo "PASSWORD" | htpasswd -ni USERNAME | base64 -w0
 # Example:
@@ -31,7 +36,7 @@ ingress:
 # Enable tabix
 enable_tabix: false
 
-# Docker custom path. If docker installed on seperate disk. Add to mount this path
+# Docker custom path to get logs with fluentd. If docker installed on separate disk add --set to mount this path.
 # docker_path: /data/docker
 
 storage: