diff --git a/.github/workflows/build-subimage.yml b/.github/workflows/build-subimage.yml
index cc86acb..afc3ccf 100644
--- a/.github/workflows/build-subimage.yml
+++ b/.github/workflows/build-subimage.yml
@@ -33,6 +33,9 @@ jobs:
         with:
           images: |
             quratorspk/ocrd-galley-${{ inputs.subimage }}
+          flavor: |
+            latest=auto
+          # latest=auto should generate "latest" for the type=semver tags entry
           tags: ${{ inputs.tags }}
       -
         name: Login to Docker Hub
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41143ce..11c0e06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,6 +41,9 @@ jobs:
       subimage: ${{ matrix.subimage }}
       tags: |
         type=sha,format=long
+        type=edge,branch=master
+        type=ref,event=branch
+        type=semver,pattern={{version}}
     secrets: inherit
 
   build-rest: