diff --git a/.gitea/workflows/docker-builder.yml b/.gitea/workflows/docker-builder.yml
index f10fdcc..6db1d25 100644
--- a/.gitea/workflows/docker-builder.yml
+++ b/.gitea/workflows/docker-builder.yml
@@ -135,15 +135,30 @@ jobs:
 
           echo "DOCKER_TAGS=$TAGS" >> $GITEA_ENV
 
+      - name: Load versions.env safely
+        shell: bash
+        run: |
+          echo "== Load versions.env =="
+          BASE_IMAGE=$(grep ^BASE_IMAGE= versions.env | cut -d '=' -f2-)
+          APP_VERSION=$(grep ^APP_VERSION= versions.env | cut -d '=' -f2-)
+          TARGET_PLATFORMS=$(grep ^TARGET_PLATFORMS= versions.env | cut -d '=' -f2-)
+          IMAGE_NAME="${REGISTRY_HOST}/${IMAGE_BASE}"
+          CACHE_IMAGE_NAME="${REGISTRY_HOST}/${IMAGE_BASE}-cache"
+          VERSION=${GITEA_REF_NAME}
+          BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+
+          echo "BASE_IMAGE=$BASE_IMAGE" >> $GITEA_ENV
+          echo "APP_VERSION=$APP_VERSION" >> $GITEA_ENV
+          echo "TARGET_PLATFORMS=$TARGET_PLATFORMS" >> $GITEA_ENV
+          echo "IMAGE_NAME=$IMAGE_NAME" >> $GITEA_ENV
+          echo "CACHE_IMAGE_NAME=$CACHE_IMAGE_NAME" >> $GITEA_ENV
+          echo "VERSION=$VERSION" >> $GITEA_ENV
+          echo "BUILD_DATE=$BUILD_DATE" >> $GITEA_ENV
+
       - name: Build & push multiarch
         if: steps.check_files.outputs.should_build == 'true'
         run: |
           echo "== Multiarch Build Start =="
-          
-          # Load versions.env
-          set -a
-          . versions.env
-          set +a
 
           # Build amd64
           docker buildx build \