diff --git a/action.yml b/action.yml
index b191499..0fb5842 100644
--- a/action.yml
+++ b/action.yml
@@ -44,10 +44,16 @@ runs:
       shell: bash
     - id: current_branch
       run: |
-        if [[ ${{ github.event_name }} == 'pull_request' && "${{ github.ref }}" != "refs/tags/"* ]]; then
-          echo "::set-output name=current_branch::${{ steps.branch.outputs.head_ref_branch }}"
+        if [[ "${{ github.ref }}" != "refs/tags/"* ]]; then
+          if [[ ${{ github.event_name }} == 'pull_request' ]]; then
+            echo "::set-output name=current_branch::${{ steps.branch.outputs.head_ref_branch }}"
+          else
+            echo "::set-output name=current_branch::${{ steps.branch.outputs.ref_branch }}"
+          fi
         else
-          echo "::set-output name=current_branch::${{ steps.branch.outputs.ref_branch }}"
+          REF=${{ github.ref }}
+          REF_BRANCH=${REF/refs\/tags\//}
+          echo "::set-output name=current_branch::$REF_BRANCH"
         fi
       shell: bash
     - id: default
@@ -64,8 +70,6 @@ runs:
       run: |
         if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
           REF=${{ github.ref }}
-          REF_BRANCH=${REF/refs\/tags\//}
-          echo "::set-output name=current_branch::$REF_BRANCH"
           TAG=${REF/refs\/tags\/${{ inputs.strip_tag_prefix }}/}
           echo "::set-output name=tag::$TAG"
         fi