diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 58e509d..b84d94e 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -80,8 +80,12 @@ jobs:
 
           # Install cert-manager (skip if already installed)
           kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.17.1/cert-manager.yaml 2>/dev/null || true
-          # Wait for cert-manager to be ready
-          kubectl -n cert-manager wait --for=condition=Available deployment/cert-manager-webhook --timeout=120s 2>/dev/null || true
+          # Wait for all cert-manager components to be ready
+          kubectl -n cert-manager wait --for=condition=Available deployment/cert-manager --timeout=180s
+          kubectl -n cert-manager wait --for=condition=Available deployment/cert-manager-cainjector --timeout=180s
+          kubectl -n cert-manager wait --for=condition=Available deployment/cert-manager-webhook --timeout=180s
+          # Extra wait for webhook endpoint registration
+          sleep 15
 
           # Apply all manifests
           set -o pipefail