diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 87fd78da..38ed234f 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -55,7 +55,7 @@ jobs:
 
   build_app:
     name: Build app
-    if: ${{ !contains(github.event.head_commit.message, 'skip app') }}
+    if: ${{ always() && !cancelled() && !failure() && !contains(github.event.head_commit.message, 'skip app') }}
     needs: [ run_tests ]
     runs-on: ubuntu-22.04
     steps:
@@ -76,7 +76,7 @@ jobs:
 
   build_docs:
     name: Build docs
-    if: ${{ contains(github.event.head_commit.message, 'build doc') }}
+    if: ${{ always() && !cancelled() && !failure() && contains(github.event.head_commit.message, 'build doc') }}
     needs: [ run_tests ]
     runs-on: ubuntu-22.04
     steps: