diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48e84d87b..3ab52cfdc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,9 @@ jobs:
     # do not run build and test steps for docs changes
     # Following https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/troubleshooting-required-status-checks#handling-skipped-but-required-checks
     # we conditionally skip the build and tests for docs(website) changes
-    if: ${{ needs.verify-changes.outputs.is_docs_change == 'false' }}
+    if: |
+      github.event.pull_request.draft == false &&
+      needs.verify-changes.outputs.is_docs_change == 'false'
     runs-on: ubuntu-latest
     needs: verify-changes
     outputs:
diff --git a/.github/workflows/verify_changes.yml b/.github/workflows/verify_changes.yml
index 376dabe0b..3cb0d19c3 100644
--- a/.github/workflows/verify_changes.yml
+++ b/.github/workflows/verify_changes.yml
@@ -13,7 +13,6 @@ on:
 jobs:
   # verify-doc-ui-changes determines if the changes are only for docs (website) and/or ui
   verify-doc-ui-changes:
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     outputs:
       is_docs_change: ${{ steps.get-changeddir.outputs.is_docs_change }}