diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ed03a70..32c0499 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -49,11 +49,16 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/collective/collective.elastic.ingest
+          flavor: |
+            latest=true
           tags: |
+            type=ref,event=branch
+            type=ref,event=pr
             type=pep440,pattern={{version}}
+            type=pep440,pattern={{major}}.{{minor}}.{{patch}}
             type=pep440,pattern={{major}}.{{minor}}
             type=pep440,pattern={{major}}
-            type=raw,value=latest
+            type=sha
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry