diff --git a/.gitea/workflows/action.yaml b/.gitea/workflows/action.yaml
index 5095412..7092be6 100644
--- a/.gitea/workflows/action.yaml
+++ b/.gitea/workflows/action.yaml
@@ -30,31 +30,37 @@ jobs:
                 echo "DOTNET_SDK_VERSION=9.0" >> $GITHUB_OUTPUT
                 echo "DOTNET_RUNTIME_VERSION=9.0.17" >> $GITHUB_OUTPUT
                 echo "ALPINE_VERSION=3.24" >> $GITHUB_OUTPUT
+                echo "IS_LATEST=true" >> $GITHUB_OUTPUT
                 ;;
               9.0-alpine-23)
                 echo "DOTNET_SDK_VERSION=9.0" >> $GITHUB_OUTPUT
                 echo "DOTNET_RUNTIME_VERSION=9.0.17" >> $GITHUB_OUTPUT
                 echo "ALPINE_VERSION=3.23" >> $GITHUB_OUTPUT
+                echo "IS_LATEST=false" >> $GITHUB_OUTPUT
                 ;;
               9.0-alpine-22)
                 echo "DOTNET_SDK_VERSION=9.0" >> $GITHUB_OUTPUT
                 echo "DOTNET_RUNTIME_VERSION=9.0" >> $GITHUB_OUTPUT
                 echo "ALPINE_VERSION=3.22" >> $GITHUB_OUTPUT
+                echo "IS_LATEST=false" >> $GITHUB_OUTPUT
                 ;;
               9.0-alpine-21)
                 echo "DOTNET_SDK_VERSION=9.0" >> $GITHUB_OUTPUT
                 echo "DOTNET_RUNTIME_VERSION=9.0" >> $GITHUB_OUTPUT
                 echo "ALPINE_VERSION=3.21" >> $GITHUB_OUTPUT
+                echo "IS_LATEST=false" >> $GITHUB_OUTPUT
                 ;;
               8.0-alpine-22)
                 echo "DOTNET_SDK_VERSION=8.0" >> $GITHUB_OUTPUT
                 echo "DOTNET_RUNTIME_VERSION=8.0" >> $GITHUB_OUTPUT
                 echo "ALPINE_VERSION=3.22" >> $GITHUB_OUTPUT
+                echo "IS_LATEST=false" >> $GITHUB_OUTPUT
                 ;;
               8.0-alpine-21)
                 echo "DOTNET_SDK_VERSION=8.0" >> $GITHUB_OUTPUT
                 echo "DOTNET_RUNTIME_VERSION=8.0" >> $GITHUB_OUTPUT
                 echo "ALPINE_VERSION=3.21" >> $GITHUB_OUTPUT
+                echo "IS_LATEST=false" >> $GITHUB_OUTPUT
                 ;;
               *)
                 echo "Unsupported branch"
@@ -77,7 +83,17 @@ jobs:
         with:
           registry: git.claeyscloud.com
           username: nologin
-          password: ${{ secrets.PACKAGE_TOKEN }}
+          password: ${{ secrets.PACKAGE_TOKEN }}  
+      - name: Build tag list
+        id: tags
+        run: |
+          TAGS="git.claeyscloud.com/david/net-base:${{ inputs.branch }}"
+      
+          if [ "${{ steps.variables.outputs.IS_LATEST }}" = "true" ]; then
+            TAGS="$TAGS,git.claeyscloud.com/david/net-base:latest"
+          fi
+      
+          echo "tags=$TAGS" >> $GITHUB_OUTPUT
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -86,12 +102,7 @@ jobs:
                 org.opencontainers.image.documentation=https://git.claeyscloud.com/david/net-base/README.md
             images: |
                 git.claeyscloud.com/david/net-base
-            tags: |
-               type=raw,value=${{ inputs.branch }}
-               type=semver,pattern={{raw}}
-               type=semver,pattern={{version}}
-               type=semver,pattern={{major}}
-               type=sha
+            tags: ${{ steps.tags.outputs.tags }}
       - name: Generate random password for certificate
         id: password
         run: