diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d01a9eb..0df0088 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -3,6 +3,9 @@ name: Build and Publish Container Image
 on:
   push:
     branches: [ main ]
+    tags: [ 'v*' ]
+  release:
+    types: [ published ]
   workflow_dispatch:
 
 jobs:
@@ -32,9 +35,11 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository_owner }}/nodecast-tv
           tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
             type=sha
             type=ref,event=branch
-            type=raw,value=latest
+            type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push Container image
         uses: docker/build-push-action@v5