diff --git a/.gitea/workflows/linux_arm64_docker.yaml b/.gitea/workflows/linux_arm64_docker.yaml
index ac09cb0..77b952e 100644
--- a/.gitea/workflows/linux_arm64_docker.yaml
+++ b/.gitea/workflows/linux_arm64_docker.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - Test-Branch
 
 jobs:
   build-docker-linux-arm64:
@@ -31,28 +30,35 @@ jobs:
       - name: Build version
         shell: bash
         run: |
-          COMMIT_COUNT=$(git rev-list $(git describe --tags --abbrev=0)..HEAD --count)
-          echo "Commit Count: $COMMIT_COUNT"
+          LAST_TAG=$(git describe --tags --abbrev=0)
           
-      - name: Set .NET version variables
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          SEMVER="${VERSION}"
-          BASE_NUMERIC=$(echo "$SEMVER" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
-          BUILD_NO=$(echo "$SEMVER" | grep -oE '[0-9]+$' || echo "0")
-
-          echo "PACKAGE_VERSION=$SEMVER" >> "$GITHUB_ENV"
-          echo "ASSEMBLY_VERSION=${BASE_NUMERIC}.0" >> "$GITHUB_ENV"
-          echo "FILE_VERSION=${BASE_NUMERIC}.${BUILD_NO}" >> "$GITHUB_ENV"
-          echo "INFORMATIONAL_VERSION=$SEMVER" >> "$GITHUB_ENV"
+          if [[ -z "${LAST_TAG:-}" ]]; then
+            echo "No tag found"
+            exit 1
+          fi
+          
+          COMMIT_COUNT=$(git rev-list $LAST_TAG..HEAD --count)
+          
+          if [[ "$LAST_TAG" == *-* ]]; then
+            TEMP_LAST_TAG ="${LAST_TAG%-*}"
+            VERSION="${TEMP_LAST_TAG}-nightly.${COMMIT_COUNT}"
+          else
+            VERSION="$[LAST_TAG}-nightly.${COMMIT_COUNT}"
+          fi
+          
+          echo "LAST_TAG=$LAST_TAG" >> "$GITHUB_ENV"
+          echo "COMMIT_COUNT=$COMMIT_COUNT" >> "$GITHUB_ENV"
+          echo "VERSION=$VERSION" >> "$GITHUB_ENV"
+          
+          echo "Last tag: $LAST_TAG"
+          echo "Commit count: $COMMIT_COUNT"
+          echo "Final version: $VERSION"
           
       - name: Build Linux ARM64 Docker Image
         run: |
           docker build \
             -t gitea.penry.de/${{ env.REPO_LC }}:nightly \
-            --build-arg VERSION=${{ env.PACKAGE_VERSION }} \
+            --build-arg VERSION=${{ env.VERSION }} \
             .
       
       - name: Login to own image registry