diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 28294eaff4..6e311e17fd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -394,7 +394,7 @@ jobs:
 
   hcp-image:
     if: |
-      needs.setup.outputs.is-ent-branch == 'true' &&
+      needs.setup.outputs.is-ent-branch == 'true' && (
       needs.setup.outputs.workflow-trigger == 'schedule' ||
       ( needs.setup.outputs.workflow-trigger == 'pull_request' &&
         (
@@ -402,13 +402,14 @@ jobs:
           contains(fromJSON(needs.setup.outputs.labels), 'hcp/test')
         )
       )
+      )
     needs:
       - setup
       - artifacts-ent
     uses: ./.github/workflows/build-hcp-image.yml
     with:
-      pull-request: ${{ needs.setup.outputs.workflow-trigger == 'pull_request' && github.event.pull_request.number || null }}
-      branch: ${{ needs.setup.outputs.workflow-trigger == 'schedule' && 'main' || null }}
+      pull-request: ${{ needs.setup.outputs.workflow-trigger == 'pull_request' && github.event.pull_request && github.event.pull_request.number || '' }}
+      branch: ${{ needs.setup.outputs.workflow-trigger == 'schedule' && 'main' || '' }}
       create-aws-image: true
       create-azure-image: false
       hcp-environment: int