diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index d2ecbeef..c70a8e65 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -99,7 +99,7 @@ jobs:
               { id: 'e2e-tests-split.yml' },
               { id: 'codecov-upload.yml', inputs: { run_backend: 'true', run_frontend: 'true' } },
               { id: 'security-pr.yml' },
-              { id: 'supply-chain-pr.yml' },
+              { id: 'supply-chain-verify.yml' },
               { id: 'codeql.yml' },
             ];
 
diff --git a/.github/workflows/supply-chain-pr.yml b/.github/workflows/supply-chain-pr.yml
index a61c2347..9aec43f7 100644
--- a/.github/workflows/supply-chain-pr.yml
+++ b/.github/workflows/supply-chain-pr.yml
@@ -357,7 +357,7 @@ jobs:
           retention-days: 14
 
       - name: Comment on PR
-        if: steps.set-target.outputs.image_name != '' && steps.pr-number.outputs.is_push != 'true'
+        if: steps.set-target.outputs.image_name != '' && steps.pr-number.outputs.is_push != 'true' && steps.pr-number.outputs.pr_number != ''
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
diff --git a/.github/workflows/supply-chain-verify.yml b/.github/workflows/supply-chain-verify.yml
index 0ab876ae..36369c04 100644
--- a/.github/workflows/supply-chain-verify.yml
+++ b/.github/workflows/supply-chain-verify.yml
@@ -79,6 +79,17 @@ jobs:
               # Replace / with - to avoid invalid reference format errors
               TAG=$(echo "${BRANCH}" | tr '/' '-')
             fi
+          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            BRANCH="${{ github.ref_name }}"
+            if [[ "${BRANCH}" == "main" ]]; then
+              TAG="latest"
+            elif [[ "${BRANCH}" == "development" ]]; then
+              TAG="dev"
+            elif [[ "${BRANCH}" == "nightly" ]]; then
+              TAG="nightly"
+            else
+              TAG=$(echo "${BRANCH}" | tr '/' '-')
+            fi
           else
             TAG="latest"
           fi
diff --git a/.github/workflows/weekly-nightly-promotion.yml b/.github/workflows/weekly-nightly-promotion.yml
index db5569bc..d0f57ae4 100644
--- a/.github/workflows/weekly-nightly-promotion.yml
+++ b/.github/workflows/weekly-nightly-promotion.yml
@@ -444,7 +444,7 @@ jobs:
               { id: 'codeql.yml' },
               { id: 'codecov-upload.yml', inputs: { run_backend: 'true', run_frontend: 'true' } },
               { id: 'security-pr.yml' },
-              { id: 'supply-chain-pr.yml' },
+              { id: 'supply-chain-verify.yml' },
             ];
 
             for (const workflow of requiredWorkflows) {