diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 772dd99..8b89759 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -287,6 +287,10 @@ jobs:
 
           GATEKEEPER_ORIGIN="$NEXT_PUBLIC_BASE_URL/gatekeeper"
 
+          if [[ "$UMAMI_API_ENDPOINT" != http* ]]; then
+            UMAMI_API_ENDPOINT="https://$UMAMI_API_ENDPOINT"
+          fi
+
           cat > .env.deploy << EOF
           # Generated by CI - $TARGET
           IMAGE_TAG=$IMAGE_TAG
@@ -388,9 +392,16 @@ jobs:
           DEPLOY_URL: ${{ needs.prepare.outputs.next_public_url }}
         run: |
           echo "Waiting for app to start..."
-          sleep 10
-          curl -sf "$DEPLOY_URL/api/health/cms" || { echo "❌ CMS health check failed"; exit 1; }
-          echo "✅ CMS health OK"
+          for i in {1..12}; do
+            if curl -sf "$DEPLOY_URL/api/health/cms" > /dev/null; then
+              echo "✅ CMS health OK"
+              exit 0
+            fi
+            echo "⏳ Waiting..."
+            sleep 5
+          done
+          echo "❌ CMS health check failed"
+          exit 1
       - name: 🚀 OG Image Check
         env:
           TEST_URL: ${{ needs.prepare.outputs.next_public_url }}