diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ac17467..639e710 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -65,11 +65,11 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
+          # Same tags for ghcr.io and Docker Hub: latest + 1.0.0 (no v prefix)
           images: ${{ steps.images.outputs.list }}
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
             type=semver,pattern={{version}}
-            type=semver,pattern=v{{version}}
 
       - name: Build and push
         uses: docker/build-push-action@v6