diff --git a/.github/workflows/new-build-core-template.yml b/.github/workflows/new-build-core-template.yml
index ab3854733e62..557d8455a31d 100644
--- a/.github/workflows/new-build-core-template.yml
+++ b/.github/workflows/new-build-core-template.yml
@@ -197,10 +197,8 @@ jobs:
         shell: bash
         run: |
           echo PLATFORM=$(echo ${{ matrix.platforms }} | tr '/' '-') >> $GITHUB_ENV
-          echo IMAGE_TAG_SHA=$(git rev-parse --short HEAD) >> $GITHUB_ENV
-          # Support for custom tag suffix
           if [ -n "${{ inputs.image_tag_suffix }}" ]; then
-            echo IMAGE_TAG_SHA_TS="${{ inputs.image_tag_suffix }}" >> $GITHUB_ENV
+            echo IMAGE_TAG_SHA_TS="${{ env.IMAGE_TAG_SUFFIX }}" >> $GITHUB_ENV
           else
             echo IMAGE_TAG_SHA_TS=$(git rev-parse --short HEAD)-$(date +%s) >> $GITHUB_ENV
           fi