diff --git a/.gitea/workflows/package.yml b/.gitea/workflows/package.yml
index 8be6ed2..882e86c 100644
--- a/.gitea/workflows/package.yml
+++ b/.gitea/workflows/package.yml
@@ -145,6 +145,8 @@ jobs:
           RAW_REF: ${{ github.ref }}
           RAW_REF_NAME: ${{ github.ref_name }}
         run: |
+          RAW_REGISTRY_HOST="$(printf '%s' "${RAW_REGISTRY_HOST}" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
+
           if [ -z "${RAW_REGISTRY_HOST}" ]; then
             echo "Missing required repository variable: REGISTRY_HOST"
             exit 1
@@ -177,6 +179,12 @@ jobs:
           REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
           REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
+          if [ -z "${REGISTRY_HOST:-}" ]; then
+            echo "Missing resolved environment value: REGISTRY_HOST"
+            echo "The previous step should write REGISTRY_HOST into GITHUB_ENV."
+            exit 1
+          fi
+
           if [ -z "${REGISTRY_USERNAME}" ]; then
             echo "Missing required repository secret: REGISTRY_USERNAME"
             exit 1
@@ -187,12 +195,18 @@ jobs:
             exit 1
           fi
 
+          echo "Logging into registry host: ${REGISTRY_HOST}"
           echo "${REGISTRY_PASSWORD}" | docker login "$REGISTRY_HOST" \
             --username "${REGISTRY_USERNAME}" \
             --password-stdin
 
       - name: Build and Push Image
         run: |
+          if [ -z "${IMAGE_NAME:-}" ] || [ -z "${IMAGE_TAG:-}" ]; then
+            echo "Missing resolved image metadata: IMAGE_NAME or IMAGE_TAG"
+            exit 1
+          fi
+
           push_with_retry() {
             image_ref="$1"
             attempt=1