diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 80a99ae..892b730 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -225,7 +225,10 @@ jobs:
           kubectl -n flux-system rollout status deployment/helm-controller --timeout=600s
           kubectl -n flux-system wait --for=condition=Ready gitrepository/platform --timeout=300s
           kubectl -n flux-system wait --for=condition=Ready kustomization/infrastructure --timeout=600s
-          kubectl -n flux-system wait --for=condition=Ready kustomization/addon-external-secrets --timeout=600s
+          # Wait for ESO CRDs and deployment directly instead of Flux Kustomization status
+          kubectl wait --for=condition=established --timeout=600s crd/clustersecretstores.external-secrets.io
+          kubectl wait --for=condition=established --timeout=600s crd/externalsecrets.external-secrets.io
+          kubectl -n kube-system rollout status deployment/external-secrets --timeout=600s
           # Create Doppler ClusterSecretStore now that ESO CRDs are available
           kubectl apply -f - <<'EOF'
           apiVersion: external-secrets.io/v1