diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 265ed5d..6679f63 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -67,9 +67,13 @@ jobs:
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tag_with_ref: 'master=latest'
-          # Add SHA tag
-          tag_with_sha: 'short'
+          tags: |
+            type=ref,event=branch
+            type=sha,prefix=commit-
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=edge
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action