diff --git a/.gitea/workflows/tag-build.yaml b/.gitea/workflows/tag-build.yaml
index c41f808..1ff88ff 100644
--- a/.gitea/workflows/tag-build.yaml
+++ b/.gitea/workflows/tag-build.yaml
@@ -21,13 +21,24 @@ jobs:
 
     - name: Get release tag
       id: vars
+      env:
+        EVENT_NAME: ${{ forgejo.event_name }}
+        REF_NAME: ${{ forgejo.ref_name }}
+        INPUT_TAG: ${{ forgejo.event_inputs.tag }}
       run: |
-        if [ "${{ forgejo.event_name }}" = "workflow_dispatch" ]; then
-          TAG="${{ forgejo.event_inputs.tag }}"
+        if [ "$EVENT_NAME" = "workflow_dispatch" ]; then
+          TAG="$INPUT_TAG"
         else
-          TAG="${{ forgejo.ref_name }}"
+          TAG="$REF_NAME"
         fi
-        echo "RELEASE_TAG=$TAG" >> $GITHUB_ENV
+
+        if [ -z "$TAG" ]; then
+          echo "::error::Release tag is empty"
+          exit 1
+        fi
+
+        echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+        echo "Building release tag: $TAG"
 
     - name: Set up Docker Buildx
       id: buildx
@@ -50,4 +61,4 @@ jobs:
         file: ./Dockerfile
         platforms: linux/amd64
         push: true
-        tags: git.coopcloud.tech/toolshed/coop-cloud-webui:${{ env.RELEASE_TAG }}
+        tags: git.coopcloud.tech/toolshed/coop-cloud-webui:${{ steps.vars.outputs.tag }}