diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b51bd9e75..4a0460400 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,6 @@ jobs:
         env:
           ACCESS_TOKEN: ${{ secrets.CI_TOKEN }}
           MESSAGE: ${{ github.event.pull_request.title || github.event.head_commit.message }}
-          BRANCH: ${{ github.ref_name }}
       - name: Build site
         run: yarn run site:build
       - name: 'Deploy Site'
diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh
index fa0efa390..48639adc9 100755
--- a/scripts/ci/build-artifacts.sh
+++ b/scripts/ci/build-artifacts.sh
@@ -34,7 +34,10 @@ buildVersion=$(node -pe "require('./package.json').version")
 branchName=${BRANCH:-'master'}
 
 buildVersionName="${buildVersion}-${commitSha}"
-buildTagName="${branchName}-${commitSha}"
+buildTagName=${TAG_NAME:-"${branchName}-${commitSha}"}
+if [[ -n "${GITHUB_HEAD_REF}" ]]; then
+  buildTagName="${branchName}-${GITHUB_HEAD_REF}"
+fi
 buildCommitMessage="${branchName} - ${MESSAGE}"
 
 repoUrl="https://github.com/ng-alain/${packageRepo}.git"