diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml
index fed41b3..5dfe2c1 100644
--- a/.gitea/workflows/build-push.yaml
+++ b/.gitea/workflows/build-push.yaml
@@ -344,7 +344,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     needs: [determine-version, build-nvidia, build-rdna2, build-strixhalo, build-intel]
-    if: needs.determine-version.outputs.should_release == 'true' && gitea.ref == 'refs/heads/main' && gitea.event_name == 'push'
+    if: needs.determine-version.outputs.should_release == 'true' && github.ref == 'refs/heads/main' && github.event_name == 'push'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -364,7 +364,8 @@ jobs:
   notify:
     name: Notify
     runs-on: ubuntu-latest
-    needs: [determine-version, build-nvidia, build-rdna2, build-strixhalo, build-intel, release]
+    # Don't depend on release - notify should run even if release never starts
+    needs: [determine-version, build-nvidia, build-rdna2, build-strixhalo, build-intel]
     if: always()
     steps:
       - name: Notify on success
@@ -384,16 +385,15 @@ jobs:
           nvidia: ${{ needs.build-nvidia.result }}
           rdna2: ${{ needs.build-rdna2.result }}
           strixhalo: ${{ needs.build-strixhalo.result }}
-          intel: ${{ needs.build-intel.result }}
-          Release: ${{ needs.release.result == 'success' && 'created' || 'skipped' }}" \
+          intel: ${{ needs.build-intel.result }}" \
             ${{ env.NTFY_URL }}/gitea-ci
 
-      - name: Notify on failure
+      - name: Notify on failure or cancellation
         if: |
-          needs.build-nvidia.result == 'failure' ||
-          needs.build-rdna2.result == 'failure' ||
-          needs.build-strixhalo.result == 'failure' ||
-          needs.build-intel.result == 'failure'
+          needs.build-nvidia.result == 'failure' || needs.build-nvidia.result == 'cancelled' ||
+          needs.build-rdna2.result == 'failure' || needs.build-rdna2.result == 'cancelled' ||
+          needs.build-strixhalo.result == 'failure' || needs.build-strixhalo.result == 'cancelled' ||
+          needs.build-intel.result == 'failure' || needs.build-intel.result == 'cancelled'
         run: |
           curl -s \
             -H "Title: ❌ Image Build Failed: ${{ gitea.repository }}" \