diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index fc2cba1..28dfb33 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -36,8 +36,6 @@ jobs:
         runner:
           - vm-docker-build2
           - vm-docker-build2
-          - vm-docker-build2
-          - vm-docker-build2
     steps:
       - name: Prune unused Docker images
         run: |
@@ -170,103 +168,6 @@ jobs:
           git push origin --delete "$TEMP_BRANCH" || true
           echo "archives_changed=true" >> $GITEA_OUTPUT
 
-  # build-and-push-docker-images:
-  #   needs: 
-      # - docker-prune
-      # - build-and-push-rootfs-archives
-  #   if: always()
-  #   # if: needs.build-and-push-rootfs-archives.outputs.archives_changed == 'true'
-  #   runs-on: vm-docker-build2
-  #   steps:
-  #     - name: Checkout source
-  #       uses: actions/checkout@v3
-
-  #     - name: Wait for archives to appear in upload repo
-  #       run: |
-  #         echo "[INFO] Waiting for archives to appear in upload-repo..."
-
-  #         mkdir -p temp-check
-  #         cd temp-check
-
-  #         # Retry loop for cloning the upload-repo
-  #         for i in {1..10}; do
-  #           echo "[INFO] Attempt $i: Cloning upload-repo..."
-  #           if git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_TOKEN }}@gitea.fithwum.tech/fithwum/debian-base.git"; then
-  #             break
-  #           fi
-  #           echo "[WARN] Clone failed. Retrying in 10 seconds..."
-  #           sleep 10
-  #         done
-
-  #         if [ ! -d "debian-base" ]; then
-  #           echo "[ERROR] Failed to clone upload-repo after retries."
-  #           exit 1
-  #         fi
-
-  #         cd debian-base
-
-  #         # Wait for all versions to show up
-  #         missing_versions=()
-  #         for version in $VERSIONS; do
-  #           found=0
-  #           for i in {1..30}; do
-  #             if [[ -f "$version/debian-$version.tar.bz2" ]]; then
-  #               found=1
-  #               break
-  #             else
-  #               echo "[WAIT] $version not ready yet, sleeping 10s..."
-  #               sleep 10
-  #             fi
-  #           done
-
-  #           if [[ $found -eq 0 ]]; then
-  #             missing_versions+=("$version")
-  #           fi
-  #         done
-
-  #         if [[ ${#missing_versions[@]} -gt 0 ]]; then
-  #           echo "[ERROR] Missing archives for: ${missing_versions[*]}"
-  #           exit 1
-  #         fi
-
-  #     - name: Generate Dockerfiles per version (if missing)
-  #       run: |
-  #         for version in $VERSIONS; do
-  #           mkdir -p "$version"
-  #           DOCKERFILE_PATH="$version/Dockerfile"
-
-  #           if [[ -f "$DOCKERFILE_PATH" ]]; then
-  #             echo "[INFO] Skipping $DOCKERFILE_PATH (already exists)"
-  #             continue
-  #           fi
-
-  #           printf '%s\n' \
-  #             "FROM scratch" \
-  #             "LABEL maintainer=\"fithwum\"" \
-  #             "ADD debian-$version.tar.bz2 /" \
-  #             "CMD [\"/bin/bash\"]" > "$DOCKERFILE_PATH"
-
-  #           echo "[INFO] Created $DOCKERFILE_PATH"
-  #         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: |
-  #         IMAGE_REGISTRY=gitea.fithwum.tech
-  #         IMAGE_ORG=fithwum
-  #         IMAGE_REPO=debian-base
-
-  #         for TAG in $VERSIONS; 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
-
   build-and-push-docker-images:
     name: Build & Push Docker Images (${{ matrix.version }})
     needs: