diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 3ce9ee0..5842550 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -50,11 +50,11 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=pr
+            type=ref,event=tag
             type=semver,pattern=v{{version}}
             type=semver,pattern=v{{major}}.{{minor}}
             type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
-            type=raw,,value={{branch}}-{{sha}}
+            type=raw,value={{branch}}-{{sha}},enable=${{ !startsWith(github.ref, 'refs/tags/') }}
       -
         name: Build image
         uses: docker/build-push-action@v3