diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index c95cafe..b17d60c 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -91,24 +91,19 @@ jobs:
           IMAGE_REGISTRY=gitea.fithwum.tech
           IMAGE_ORG=fithwum
           IMAGE_REPO=debian-base
-          
+
           IMAGE_TAGS=(buster bullseye bookworm docker-build)
 
           for TAG in "${IMAGE_TAGS[@]}"; do
             FULL_IMAGE="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${TAG}"
-            echo "IMAGE_${TAG^^}=${FULL_IMAGE}" >> $GITHUB_ENV
+            # Use lowercase env var names matching the tag exactly
+            echo "IMAGE_${TAG}=${FULL_IMAGE}" >> $GITHUB_ENV
           done
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
       - name: Build and push Docker images
         run: |
           for TAG in buster bullseye bookworm docker-build; do
-            docker buildx build --platform linux/amd64 --push -t "${{ env['IMAGE_' + TAG^^] }}" "./${TAG}"
+            docker buildx build --platform linux/amd64 --push -t "${{ env['IMAGE_' + TAG] }}" "./${TAG}"
           done