diff --git a/.github/workflows/build-boot-iso.yml b/.github/workflows/build-boot-iso.yml
index 764204d2d92..e9ef9114930 100644
--- a/.github/workflows/build-boot-iso.yml
+++ b/.github/workflows/build-boot-iso.yml
@@ -109,6 +109,7 @@ jobs:
       # we post statuses manually as this does not run from a pull_request event
       # https://developer.github.com/v3/repos/statuses/#create-a-status
       - name: Create in-progress status
+        if: github.event_name != 'workflow_dispatch'
         uses: octokit/request-action@v2.x
         with:
           route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
@@ -166,7 +167,7 @@ jobs:
             result/iso/boot.iso
 
       - name: Set result status
-        if: always()
+        if: {{ always() && github.event_name != 'workflow_dispatch' }}
         uses: octokit/request-action@v2.x
         with:
           route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
diff --git a/.github/workflows/build-boot-iso.yml.j2 b/.github/workflows/build-boot-iso.yml.j2
index c42929f3a4b..19bb4d434de 100644
--- a/.github/workflows/build-boot-iso.yml.j2
+++ b/.github/workflows/build-boot-iso.yml.j2
@@ -103,6 +103,7 @@ jobs:
       # we post statuses manually as this does not run from a pull_request event
       # https://developer.github.com/v3/repos/statuses/#create-a-status
       - name: Create in-progress status
+        if: github.event_name != 'workflow_dispatch'
         uses: octokit/request-action@v2.x
         with:
           route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'
@@ -160,7 +161,7 @@ jobs:
             result/iso/boot.iso
 
       - name: Set result status
-        if: always()
+        if: {{ always() && github.event_name != 'workflow_dispatch' }}
         uses: octokit/request-action@v2.x
         with:
           route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}'