diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml
index 0647741..faae94a 100644
--- a/.forgejo/workflows/ci-cd.yml
+++ b/.forgejo/workflows/ci-cd.yml
@@ -30,9 +30,14 @@ jobs:
           config-inline: |
             [registry."${{ env.REGISTRY }}"]
               ca=["/etc/ssl/certs/ca-certificates.crt"]
+      - name: Tag Version
       - name: Tag Version
         run: |
-          echo "IMAGE_VERSION=latest"
+          if [ "${{ github.ref_type }}" == "tag" ]; then
+            echo "IMAGE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=latest" >> $GITHUB_ENV
+          fi
       - name: Login in to registry
         uses: docker/login-action@v2
         with: