diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 653081e..0ecf835 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -249,10 +249,9 @@ jobs:
             reconcile.fluxcd.io/resetAt="$TS" \
             reconcile.fluxcd.io/forceAt="$TS" \
             --overwrite || true
-          kubectl -n flux-system annotate kustomization/addon-nfs-storage reconcile.fluxcd.io/requestedAt="$TS" --overwrite || true
-          kubectl -n flux-system wait --for=condition=Ready helmrelease/nfs-subdir-external-provisioner --timeout=600s
-          kubectl -n flux-system wait --for=condition=Ready kustomization/addon-nfs-storage --timeout=600s
           kubectl -n flux-system wait --for=condition=Ready kustomization/addon-tailscale-operator --timeout=300s
+          kubectl -n kube-system rollout status deployment/kube-system-nfs-subdir-external-provisioner --timeout=600s
+          kubectl get storageclass flash-nfs
 
       - name: Wait for Rancher and backup operator
         env:
@@ -265,13 +264,20 @@ jobs:
             reconcile.fluxcd.io/resetAt="$TS" \
             reconcile.fluxcd.io/forceAt="$TS" \
             --overwrite || true
+          kubectl -n flux-system annotate helmrelease/rancher-backup \
+            reconcile.fluxcd.io/requestedAt="$TS" \
+            reconcile.fluxcd.io/resetAt="$TS" \
+            reconcile.fluxcd.io/forceAt="$TS" \
+            --overwrite || true
 
           echo "Waiting for Rancher..."
-          kubectl -n flux-system wait --for=condition=Ready helmrelease/rancher --timeout=900s
-          kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher --timeout=900s
+          kubectl -n cattle-system rollout status deployment/cattle-system-rancher --timeout=900s
+          kubectl -n cattle-system rollout status deployment/rancher-webhook --timeout=900s
+          kubectl -n cattle-system wait --for=condition=Ready issuer/cattle-system-rancher --timeout=900s
+          kubectl -n cattle-system wait --for=condition=Ready certificate/tls-rancher-ingress --timeout=900s
 
           echo "Waiting for rancher-backup operator..."
-          kubectl -n flux-system wait --for=condition=Ready kustomization/addon-rancher-backup --timeout=600s || true
+          kubectl -n cattle-resources-system rollout status deployment/rancher-backup --timeout=900s
 
       - name: Restore Rancher from latest B2 backup
         env: