diff --git a/deployment/zitadel/cert-job.yaml b/deployment/zitadel/cert-job.yaml
index ecf10a0..b9350fb 100644
--- a/deployment/zitadel/cert-job.yaml
+++ b/deployment/zitadel/cert-job.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: zitadel-cert-creator
+  annotations: 
+    argocd.argoproj.io/sync-wave: "2"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -16,6 +18,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: zitadel-cert-creator
+  annotations: 
+    argocd.argoproj.io/sync-wave: "2"
 subjects:
   - kind: ServiceAccount
     name:  zitadel-cert-creator
@@ -28,6 +32,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: create-zitadel-cert
+  annotations: 
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   template:
     spec:
diff --git a/deployment/zitadel/cockroach-values.yaml b/deployment/zitadel/cockroach-values.yaml
index 6ba315a..8bd69cd 100644
--- a/deployment/zitadel/cockroach-values.yaml
+++ b/deployment/zitadel/cockroach-values.yaml
@@ -1,2 +1,4 @@
 tls:
   enabled: true
+annotations: 
+  argocd.argoproj.io/sync-wave: "1"
\ No newline at end of file
diff --git a/deployment/zitadel/secrets.yaml b/deployment/zitadel/secrets.yaml
index 2dda748..a343364 100644
--- a/deployment/zitadel/secrets.yaml
+++ b/deployment/zitadel/secrets.yaml
@@ -3,7 +3,7 @@ kind: Secret
 metadata:
   name: zitadel-masterkey
   annotations:
-    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/sync-wave: "2"
   labels:
     secret-generator.cs.sap.com/enabled: "true"
 stringData: 
@@ -14,7 +14,7 @@ kind: Secret
 metadata:
   name: cockroach-auth
   annotations:
-    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/sync-wave: "2"
   labels:
     secret-generator.cs.sap.com/enabled: "true"
 stringData:
diff --git a/deployment/zitadel/values.yaml b/deployment/zitadel/values.yaml
index 2ad5e80..1319c16 100644
--- a/deployment/zitadel/values.yaml
+++ b/deployment/zitadel/values.yaml
@@ -18,7 +18,8 @@ zitadel:
   dbSslCaCrtSecret: db-cockroachdb-ca-secret
   dbSslAdminCrtSecret: db-cockroachdb-client-secret
   dbSslUserCrtSecret: db-cockroachdb-zitadel-secret
-
+annotations: 
+  argocd.argoproj.io/sync-wave: "3"
 env:
   - name: ZITADEL_DATABASE_COCKROACH_USER_PASSWORD
     valueFrom: