diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60d1df5..af3a3df 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,6 +45,11 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: foomo/contentfulproxy
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v1