diff --git a/.github/workflows/reusable-docker-arm-build.yaml b/.github/workflows/reusable-docker-arm-build.yaml
index 2b4ef6c04..8d9d668a4 100644
--- a/.github/workflows/reusable-docker-arm-build.yaml
+++ b/.github/workflows/reusable-docker-arm-build.yaml
@@ -61,14 +61,19 @@ jobs:
       - name: Set Version
         if: ${{ startsWith(github.ref, 'refs/tags/v') || github.event_name == 'pull_request' }}
         run: |
-          echo "GIT_VERSION=$(git describe --always --tags --dirty)" >> $GITHUB_ENV
+          echo "RELEASE=$(git describe --always --tags --dirty)" >> $GITHUB_ENV
       - name: Set Version
         if: ${{ github.ref == 'refs/heads/master' }}
         run: |
           echo "RELEASE=master" >> $GITHUB_ENV
       - name: Set Image name
         run: |
-          IMAGE_REF=$(SOFTWARE_VERSION=v${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=${{ env.RELEASE }} kairos-agent versioneer container-artifact-name)
+          SOFTWARE_VERSION="${{ inputs.k3s_version }}"
+          if [ -n "$SOFTWARE_VERSION" ]; then
+            SOFTWARE_VERSION="v$SOFTWARE_VERSION"
+          fi
+
+          IMAGE_REF=$(SOFTWARE_VERSION=${SOFTWARE_VERSION} SOFTWARE_VERSION_PREFIX=k3s FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=${{ env.RELEASE }} kairos-agent versioneer container-artifact-name)
           echo "IMAGE_REF=${IMAGE_REF}" >> $GITHUB_ENV
       - name: Set up Docker Buildx
         if: ${{ inputs.worker != 'ARM64' }}
@@ -106,7 +111,7 @@ jobs:
             FAMILY=${{ inputs.family }}
             BASE_IMAGE=${{ inputs.base_image }}
             RELEASE=${{ env.GIT_VERSION }}
-            SOFTWARE_VERSION=v${{ inputs.k3s_version }}
+            SOFTWARE_VERSION: ${{ inputs.k3s_version && 'v' || '' }}${{ inputs.k3s_version }}
             SOFTWARE_VERSION_PREFIX=k3s
             # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver
             FRAMEWORK_VERSION=v2.15.12
@@ -155,7 +160,7 @@ jobs:
             FAMILY=${{ inputs.family }}
             BASE_IMAGE=${{ inputs.base_image }}
             RELEASE=${{ env.GIT_VERSION }}
-            SOFTWARE_VERSION=v${{ inputs.k3s_version }}
+            SOFTWARE_VERSION: ${{ inputs.k3s_version && 'v' || '' }}${{ inputs.k3s_version }}
             SOFTWARE_VERSION_PREFIX=k3s
             # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver
             FRAMEWORK_VERSION=v2.15.12