diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index ddb92c5d..6b9cddba 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -56,11 +56,12 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ghcr.io/${{ github.repository }}${{ matrix.image.suffix }}
-          flavor: latest=true
+          flavor: latest=false
           tags: |
             type=raw,value=canary,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=ref,event=pr
             type=semver,pattern={{raw}}
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1