diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
index 18da775b3..cbebb2cb4 100644
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -117,10 +117,10 @@ jobs:
 
   tag-latest:
     needs: build
-    if: ${{ needs.build.result == 'success' }}
+    if: ${{ needs.build.result == 'success' && !contains(github.ref_name, '-') }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    name: Tag images as latest
+    name: Tag release build as latest
     strategy:
       matrix:
         service:
@@ -145,8 +145,8 @@ jobs:
       - name: Login to Docker Hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      - name: Tag multi-arch image as latest for ${{ matrix.service }}
+      - name: Tag as latest for ${{ matrix.service }}
         run: |
           docker buildx imagetools create \
             --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
-            ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG
\ No newline at end of file
+            ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG