diff --git a/services/monitoring/grafana-user-dedupe-job.yaml b/services/monitoring/grafana-user-dedupe-job.yaml
index 3eb001b..e56362b 100644
--- a/services/monitoring/grafana-user-dedupe-job.yaml
+++ b/services/monitoring/grafana-user-dedupe-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: grafana-user-dedupe-api-v4
+  name: grafana-user-dedupe-api-v5
   namespace: monitoring
 spec:
   backoffLimit: 1
@@ -10,7 +10,6 @@ spec:
     metadata:
       annotations:
         vault.hashicorp.com/agent-inject: "true"
-        vault.hashicorp.com/agent-pre-populate: "true"
         vault.hashicorp.com/agent-pre-populate-only: "true"
         vault.hashicorp.com/role: "monitoring"
         vault.hashicorp.com/agent-inject-secret-grafana-env.sh: "kv/data/atlas/monitoring/grafana-admin"
@@ -32,6 +31,16 @@ spec:
           args:
             - |
               set -euo pipefail
+              for _ in $(seq 1 30); do
+                if [ -f /vault/secrets/grafana-env.sh ]; then
+                  break
+                fi
+                sleep 1
+              done
+              if [ ! -f /vault/secrets/grafana-env.sh ]; then
+                echo "Vault secret not available"
+                exit 1
+              fi
               . /vault/secrets/grafana-env.sh
               grafana_url="${GRAFANA_URL}"
               if [ -z "${grafana_url}" ]; then