diff --git a/.mokogitea/workflows/ci-generic.yml b/.mokogitea/workflows/ci-generic.yml
index bb71ba4..d4c6348 100644
--- a/.mokogitea/workflows/ci-generic.yml
+++ b/.mokogitea/workflows/ci-generic.yml
@@ -132,8 +132,9 @@ jobs:
     name: Tests
     runs-on: ubuntu-latest
     needs: lint
-    # Skip on template repos (Template-*) — see lint job.
-    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
+    # Run only when lint succeeded; always() forces evaluation so a skipped
+    # lint (e.g. template repos) skips this job cleanly instead of hanging.
+    if: ${{ always() && needs.lint.result == 'success' }}
 
     steps:
       - name: Checkout
diff --git a/.mokogitea/workflows/pr-check.yml b/.mokogitea/workflows/pr-check.yml
index 5c735a7..4e290cc 100644
--- a/.mokogitea/workflows/pr-check.yml
+++ b/.mokogitea/workflows/pr-check.yml
@@ -494,6 +494,9 @@ jobs:
     name: Build RC Package
     runs-on: ubuntu-latest
     needs: [branch-policy, validate]
+    # Run only when both gates succeeded; always() forces evaluation so a skipped
+    # validate (e.g. template repos) skips this job cleanly instead of hanging.
+    if: ${{ always() && needs.branch-policy.result == 'success' && needs.validate.result == 'success' }}
 
     steps:
       - name: Trigger RC pre-release