diff --git a/deployment/zitadel/cert-job.yaml b/deployment/zitadel/cert-job.yaml
index f5409f6..f6463fa 100644
--- a/deployment/zitadel/cert-job.yaml
+++ b/deployment/zitadel/cert-job.yaml
@@ -3,8 +3,7 @@ kind: ServiceAccount
 metadata:
   name: zitadel-cert-creator
   annotations: 
-    argocd.argoproj.io/hook: Sync
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/hook: PreSync
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -20,8 +19,7 @@ kind: RoleBinding
 metadata:
   name: zitadel-cert-creator
   annotations: 
-    argocd.argoproj.io/hook: Sync
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/hook: PreSync
 subjects:
   - kind: ServiceAccount
     name:  zitadel-cert-creator
@@ -35,8 +33,7 @@ kind: Job
 metadata:
   name: create-zitadel-cert
   annotations: 
-    argocd.argoproj.io/hook: Sync
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/hook: PreSync
 spec:
   template:
     spec:
diff --git a/deployment/zitadel/cockroach-values.yaml b/deployment/zitadel/cockroach-values.yaml
index 4e231da..41ee51b 100644
--- a/deployment/zitadel/cockroach-values.yaml
+++ b/deployment/zitadel/cockroach-values.yaml
@@ -1,5 +1,9 @@
 tls:
   enabled: true
-  
+    
 annotations:
-  argocd.argoproj.io/hook: Sync
\ No newline at end of file
+  argocd.argoproj.io/hook: Sync
+
+init:
+  jobAnnotations:
+    argocd.argoproj.io/hook: Sync
\ No newline at end of file