diff --git a/.forgejo/workflows/ci-cd.yml b/.forgejo/workflows/ci-cd.yml
index 92472637..9b2545e9 100644
--- a/.forgejo/workflows/ci-cd.yml
+++ b/.forgejo/workflows/ci-cd.yml
@@ -29,7 +29,11 @@ jobs:
               ca=["/etc/ssl/certs/ca-certificates.crt"]
       - 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: