diff --git a/kibana/templates/job-flush-kibana-metadata.yaml b/kibana/templates/job-flush-kibana-metadata.yaml
index e96a2c7cb..741234bf3 100644
--- a/kibana/templates/job-flush-kibana-metadata.yaml
+++ b/kibana/templates/job-flush-kibana-metadata.yaml
@@ -41,7 +41,7 @@ spec:
       labels:
 {{ tuple $envAll "kibana" "flush_kibana_metadata" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
-        "helm.sh/hook": post-delete, pre-upgrade
+        "helm.sh/hook": pre-install, post-delete, pre-upgrade
         "helm.sh/hook-delete-policy": hook-succeeded
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 2d11c1d12..49f4ad3ff 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -161,17 +161,21 @@ dependencies:
         - endpoint: internal
           service: local_image_registry
     kibana:
+      jobs:
+        - flush-kibana-metadata
       services:
         - endpoint: internal
           service: elasticsearch
     register_kibana_indexes:
+      jobs:
+        - flush-kibana-metadata
       services:
         - endpoint: internal
           service: kibana
     flush_kibana_metadata:
       services:
         - endpoint: internal
-          service: kibana
+          service: elasticsearch
 
 jobs:
   flush_kibana_metadata: