diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml
index 2963331..5073be4 100644
--- a/.gitea/workflows/build-and-push.yaml
+++ b/.gitea/workflows/build-and-push.yaml
@@ -145,10 +145,11 @@ jobs:
           set +a
 
           DOCKER_ARGS=()
-          keys=$(grep -v '^#' buildargs.env | cut -d'=' -f1 | tr -d '\r')
-          for k in $keys; do
-            DOCKER_ARGS+=("--build-arg" "$k=${!k}")
-          done
+          while IFS='=' read -r key val || [ -n "$key" ]; do
+            [[ "$key" =~ ^#.*$ || -z "$key" ]] && continue
+            eval "RESOLVED_VAL=\"$val\""
+            DOCKER_ARGS+=("--build-arg" "$key=$RESOLVED_VAL")
+          done < <(grep -v '^#' buildargs.env | sed 's/\r$//')
           
           BASE_SHA=$(docker buildx imagetools inspect $BASE --format '{{json .Manifest.Digest}}' 2>/dev/null | tr -d '"' || echo "unknown")