diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml
index 0faf0d1fc2..e92ed72350 100644
--- a/.github/workflows/release-files.yml
+++ b/.github/workflows/release-files.yml
@@ -43,15 +43,16 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
+          ref: '${{ github.head_ref || github.ref_name }}'
 
       - uses: rickstaa/action-create-tag@a1c7777fcb2fee4f19b0f283ba888afa11678b72 # v1.7.2
         id: "tag_create"
         with:
           commit_sha: ${{ inputs.file_sha }}
           tag: "${{ inputs.use_tag }}"
-          force_push_tag: true
+          force_push_tag: false
+          tag_exists_error: false
           message: "Latest snapshot-1.14"
-        if: ${{ inputs.use_environ == 'snapshots' }}
 
       # Print result using the action output.
       - run: |
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index 1f298dff61..8286f9860c 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -90,6 +90,7 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           path: hdfsrc
+          ref: '${{needs.check_commits.outputs.branch_ref }}'
 
       - name: Install Autotools Dependencies (Linux, serial)
         run: |