diff --git a/.github/workflows/preview-image.yml b/.github/workflows/preview-image.yml
index 4676eb55..d6574424 100644
--- a/.github/workflows/preview-image.yml
+++ b/.github/workflows/preview-image.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   build-skip-check:
     runs-on: ubuntu-22.04
-    if: ${{ github.event.workflow_run.conclusion == 'success' && (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/master')) }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' && (startsWith(github.event.workflow_run.head_branch, 'refs/tags/') || startsWith(github.event.workflow_run.head_branch, 'refs/heads/master')) }}
     outputs:
       skip: ${{ steps.skip-check.outputs.skip }}
     steps:
@@ -68,8 +68,9 @@ jobs:
         id: version
         run: |
           set -x
+          BRANCH=${{ github.event.workflow_run.head_branch }}
           VERSION=$(jq -r .version package.json) 
-          if [[ "$GITHUB_REF" =~ ^refs/tags/.* ]]; then
+          if [[ "$BRANCH" =~ ^refs/tags/.* ]]; then
             FULL_VERSION=${VERSION}
           else
             FULL_VERSION=${VERSION}-b${GITHUB_RUN_ID}.${GITHUB_RUN_NUMBER}