diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82223a5..32cc355 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
 
   tag_and_publish:
     runs-on: ubuntu-latest
-    if: github.head_ref == 'master' || github.head_ref == 'dev'
+    if: github.ref_name == 'dev' || github.ref_name == 'master' && github.event_name == 'push'
     needs: test
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-tags: true
-          ref: ${{ github.head_ref }}
+          ref: ${{ github.ref_name }}
           fetch-depth: 0
 
       - name: setup git
@@ -67,7 +67,7 @@ jobs:
       - name: set version format
         id: version_format
         run: |
-          if [[ ${{ github.head_ref }} == 'master' ]]; then
+          if [[ ${{ github.ref_name }} == 'master' ]]; then
             echo "version_format=\${major}.\${minor}.\${patch}" >> $GITHUB_OUTPUT
           else
             echo "version_format=\${major}.\${minor}.\${patch}rc\${increment}" >> $GITHUB_OUTPUT
@@ -84,7 +84,7 @@ jobs:
           version_format: ${{ steps.version_format.outputs.version_format }}
 
       - name: Create & Push Tag
-        if: github.head_ref == 'master' || github.head_ref == 'dev'
+        if: github.ref_name == 'master' || github.ref_name == 'dev'
         run: |
           git tag ${{ steps.git_version.outputs.version }}
           git push origin ${{ steps.git_version.outputs.version }}