diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 398d39a..b349ab0 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -4,7 +4,7 @@ on:
   #schedule:
   #  - cron: '0 0 * * *'
   push:
-    branches: [ master ]
+    branches: [ 'master', 'main', 'develop', 'feature/*' ]
     # Publish semver tags as releases.
     tags: [ 'v?*.*.*' ]
   pull_request:
@@ -47,6 +47,12 @@ jobs:
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          #https://github.com/docker/metadata-action#semver
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action