diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1086d3f6..e78da149 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -61,6 +61,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get tag
+        run: echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
+
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
@@ -68,9 +71,9 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ matrix.image }}
-
-      - name: Get tag
-        run: echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
+          tags: |
+            type=raw,value=latest,enable=${{ !contains(env.TAG, 'beta') }}
+            type=semver,pattern={{raw}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action