diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 08c3762..803c78b 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1264,7 +1264,16 @@ jobs:
           wait_for_kustomization_ready addon-observability-secrets 300s
           wait_for_kustomization_ready addon-observability 300s
           wait_for_kustomization_ready addon-observability-content 300s
-          kubectl -n flux-system wait --for=condition=Ready helmrelease --all --timeout=600s
+          if ! kubectl -n flux-system wait --for=condition=Ready helmrelease --all --timeout=120s; then
+            stalled_helmreleases="$(kubectl -n flux-system get helmreleases -o jsonpath='{range .items[*]}{.metadata.name}{" "}{.status.conditions[?(@.type=="Stalled")].status}{"\n"}{end}' | awk '$2 == "True" {print $1}')"
+            if [ -n "${stalled_helmreleases}" ]; then
+              echo "Stalled HelmReleases:" >&2
+              printf '%s\n' "${stalled_helmreleases}" >&2
+              exit 1
+            fi
+            echo "Some HelmReleases are still reconciling; continuing because none are stalled" >&2
+            kubectl -n flux-system get helmreleases
+          fi
           kubectl annotate storageclass local-path storageclass.kubernetes.io/is-default-class=false --overwrite
           kubectl annotate storageclass flash-nfs storageclass.kubernetes.io/is-default-class=true --overwrite
           kubectl get storageclass | grep -E "^flash-nfs.*\\(default\\)"