diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 3987786..d589e05 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -84,41 +84,30 @@ jobs:
           fi
 
   build-and-push-docker-images:
-    needs: push-archives-to-repo
-    runs-on: docker-build
+  needs: push-archives-to-repo
+  runs-on: docker-build
 
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v3
+  steps:
+    - name: Checkout source
+      uses: actions/checkout@v3
 
-      - name: Set image tags and names
-        id: vars
-        run: |
-          IMAGE_REGISTRY=gitea.fithwum.tech
-          IMAGE_ORG=fithwum
-          IMAGE_REPO=debian-base
-          IMAGE_TAGS=(buster bullseye bookworm docker-build)
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
 
-          for TAG in "${IMAGE_TAGS[@]}"; do
-            TAG_UPPER=$(echo "$TAG" | tr '[:lower:]' '[:upper:]')
-            FULL_IMAGE="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${TAG}"
-            echo "IMAGE_${TAG_UPPER}=${FULL_IMAGE}" >> $GITHUB_ENV
-          done
+    - name: Log in to Gitea Registry
+      run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      - 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
-            TAG_UPPER=$(echo "$TAG" | tr '[:lower:]' '[:upper:]')
-            IMAGE_VAR="IMAGE_${TAG_UPPER}"
-            docker buildx build --platform linux/amd64 --push -t "${{ env[IMAGE_VAR] }}" "./${TAG}"
-          done
+    - name: Build and push Docker images
+      run: |
+        IMAGE_REGISTRY=gitea.fithwum.tech
+        IMAGE_ORG=fithwum
+        IMAGE_REPO=debian-base
 
+        for TAG in buster bullseye bookworm docker-build; do
+          FULL_IMAGE="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${TAG}"
+          echo "[INFO] Building and pushing $FULL_IMAGE"
+          docker buildx build --platform linux/amd64 --push -t "$FULL_IMAGE" "./$TAG"
+        done