diff --git a/action.yml b/action.yml
index 0787b61..31e6f97 100644
--- a/action.yml
+++ b/action.yml
@@ -37,7 +37,7 @@ runs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
         with:
           flavor: |
-            latest=${{ github.ref == 'refs/heads/main' }}                                                       
+            latest=${{ github.ref_name == 'main' || github.ref_name == 'master' }}                                                       
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}},value=${{steps.tag.outputs.tag}}
@@ -74,7 +74,7 @@ runs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: |
             type=registry,ref=${{ inputs.registry }}/${{ inputs.image_name }}-cache:latest
-            type=registry,ref=${{ inputs.registry }}/${{ inputs.image_name }}-cache:main
+            type=registry,ref=${{ inputs.registry }}/${{ inputs.image_name }}-cache:${{ github.ref_name }}
             ${{ steps.cache.outputs.cache-from }}                                                
           cache-to: |
             ${{ steps.cache.outputs.cache-to }}