diff --git a/scripts/helm/kube-install.sh b/scripts/helm/kube-install.sh
index 5402ac239..0a42416bf 100755
--- a/scripts/helm/kube-install.sh
+++ b/scripts/helm/kube-install.sh
@@ -128,7 +128,7 @@ function app(){
             exit 0
             ;;
         postgresql|redis|clickhouse)
-            ansible-playbook -c local setup.yaml -e @vars.yaml -e scale=$installation_type -e db_name=$1 --tags db -v
+            ansible-playbook -c local setup.yaml -e @vars.yaml -e scale=$installation_type -e db_name=$1 --tags template --tags db -v
             exit 0
             ;;
         frontend)
diff --git a/scripts/helm/roles/openreplay/tasks/install-dbs.yaml b/scripts/helm/roles/openreplay/tasks/install-dbs.yaml
index ef178663c..2621c680a 100644
--- a/scripts/helm/roles/openreplay/tasks/install-dbs.yaml
+++ b/scripts/helm/roles/openreplay/tasks/install-dbs.yaml
@@ -2,9 +2,7 @@
 ---
 - name: Installing specific db
   shell: |
-    override=''
-    [[ -f /tmp/'{{ db_name }}.yaml' ]] && override='-f /tmp/{{ db_name }}.yaml' || true
-    helm upgrade --install -n db {{ db_name }} -f app/{{ db_name }}.yaml ${override} ./db/{{ db_name }} --create-namespace
+    helm upgrade --install -n db {{ db_name }} -f /tmp/{{ db_name }}.yaml ./db/{{ db_name }} --wait --create-namespace
   args:
     executable: /bin/bash
   when: db_name|length > 0